[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/02/14 18:57:46

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
        copy clip-events to loaded movie. Fixes loadMovieTest.swf.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5653&r2=1.5654
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.475&r2=1.476

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5653
retrieving revision 1.5654
diff -u -b -r1.5653 -r1.5654
--- ChangeLog   14 Feb 2008 18:42:50 -0000      1.5653
+++ ChangeLog   14 Feb 2008 18:57:45 -0000      1.5654
@@ -1,5 +1,7 @@
 2008-02-14 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (loadMovie): copy clip-events to loaded
+         movie. Fixes loadMovieTest.swf.
        * testsuite/misc-ming.all/: loadMovieTest.c, loadMovieTestRunner.cpp:
          Test that clip event handlers defined for a clip are copied to
          movies loaded into them. Improve the test runner to follow

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -b -r1.475 -r1.476
--- server/sprite_instance.cpp  14 Feb 2008 12:07:35 -0000      1.475
+++ server/sprite_instance.cpp  14 Feb 2008 18:57:46 -0000      1.476
@@ -4078,6 +4078,13 @@
     // Set lockroot to our value of it
     extern_movie->setLockRoot( getLockRoot() );
 
+    // Copy event handlers
+    // see testsuite/misc-ming.all/loadMovieTest.swf
+    const Events& clipEvs = get_event_handlers();
+    // top-level movies can't have clip events, right ?
+    assert ( extern_movie->get_event_handlers().empty() );
+    extern_movie->set_event_handlers(clipEvs);
+
     save_extern_movie(extern_movie.get());
 
     const std::string& name = get_name();