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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/02/14 10:08:07

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
        still look for a user-defined onLoad handler if the sprite is dynamic.
        Fixes latest testcase, but not FlowPlayer yet (which was the inspiration
        for the previous test).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5644&r2=1.5645
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.473&r2=1.474

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5644
retrieving revision 1.5645
diff -u -b -r1.5644 -r1.5645
--- ChangeLog   14 Feb 2008 09:04:09 -0000      1.5644
+++ ChangeLog   14 Feb 2008 10:08:06 -0000      1.5645
@@ -1,5 +1,9 @@
 2008-02-14 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (on_event): still look for a user-defined
+         onLoad handler if the sprite is dynamic. Fixes latest testcase, but
+         not FlowPlayer yet (which was the inspiration for the previous
+         test).
        * testsuite/misc-ming.all/registerClassTest.c: test that used-defined
          onLoad should be called when available for dynamic clips placed
          by attachMovie (even when 'clip' event flags are all zero..).

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -b -r1.473 -r1.474
--- server/sprite_instance.cpp  13 Feb 2008 18:44:08 -0000      1.473
+++ server/sprite_instance.cpp  14 Feb 2008 10:08:07 -0000      1.474
@@ -2510,21 +2510,23 @@
   }
 
 
-  // NOTE: user-defined onLoad is not invoked if the corresponding
-  //       clip-defined onLoad is not present (zou mentions if
-  //       NO clip-defined events are instead)
+  // NOTE: user-defined onLoad is not invoked for static
+  //       clips on which no clip-events are defined.
+  //       see testsuite/misc-ming.all/action_execution_order_extend_test.swf
   //
   //   Note that this can't be true for sprites
-  //   not placed by PlaceObject
+  //   not placed by PlaceObject, see
+  //   testsuite/misc-ming.all/registerClassTest.swf
   //
   if ( id.m_id == event_id::LOAD )
   {
-    if ( get_parent() && get_event_handlers().empty() )
+    if ( (!isDynamic()) && get_parent() && get_event_handlers().empty() )
     {
-#ifdef GNASH_DEBUG
-      log_debug("Sprite %s won't check for user-defined LOAD event (had no 
clip events defined)", getTarget().c_str());
-      testInvariant();
-#endif
+//#ifdef GNASH_DEBUG
+      log_debug("Sprite %s (depth %d) won't check for user-defined LOAD event 
(is not dynamic, has a parent and had no clip events defined)",
+               getTarget().c_str(), get_depth());
+      //testInvariant();
+//#endif
       
       return called;
     }