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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/02/28 11:18:37

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/swfdec: PASSING 

Log message:
        don't queue a LOAD event for the root movie for SWF versions up to 5.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5757&r2=1.5758
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.480&r2=1.481
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.95&r2=1.96

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5757
retrieving revision 1.5758
diff -u -b -r1.5757 -r1.5758
--- ChangeLog   28 Feb 2008 09:18:45 -0000      1.5757
+++ ChangeLog   28 Feb 2008 11:18:34 -0000      1.5758
@@ -1,5 +1,11 @@
 2008-02-28 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (stagePlacementCallback): don't queue
+         a LOAD event for the root movie for SWF versions up to 5.
+       * testsuite/swfdec/PASSING: root-onload-5.swf succeeds.
+
+2008-02-28 Sandro Santilli <address@hidden>
+
        * testsuite/swfdec/PASSING: sync to swfdec master git.
 
 2008-02-28 Sandro Santilli <address@hidden>

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -b -r1.480 -r1.481
--- server/sprite_instance.cpp  20 Feb 2008 14:46:28 -0000      1.480
+++ server/sprite_instance.cpp  28 Feb 2008 11:18:36 -0000      1.481
@@ -3954,16 +3954,18 @@
   assert(!_callingFrameActions); // or will not be queuing actions
   if ( get_parent() == 0 )
   {
-
 #ifdef GNASH_DEBUG
     log_debug(_("Executing tags of frame0 in sprite %s"), getTarget().c_str());
 #endif
     execute_frame_tags(0, TAG_DLIST|TAG_ACTION);
 
+    if ( _vm.getSWFVersion() > 5 )
+    {
 #ifdef GNASH_DEBUG
     log_debug(_("Queuing ONLOAD event for sprite %s"), getTarget().c_str());
 #endif
     queueEvent(event_id::LOAD, movie_root::apDOACTION);
+    }
 
   }
   else

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- testsuite/swfdec/PASSING    28 Feb 2008 09:22:45 -0000      1.95
+++ testsuite/swfdec/PASSING    28 Feb 2008 11:18:36 -0000      1.96
@@ -535,6 +535,7 @@
 removesprite-depths-7.swf:b792dc92c63978c09f9c937a2d5a24cf
 remove-with-onUnload-5.swf:5d41fcdce5757cff3e4c9678c9c3e72b
 rewind-remove-5.swf:70780bb0428e3795f6866a1c47bb46b0
+root-onload-5.swf:4f41e2bffb53d75ce665c54312f66190
 root-onload-6.swf:0d09109c7f942e8268aa0b9661071f1d
 root-onload-7.swf:baed64fdde7c5f27344daa4268ce6202
 root-onload-8.swf:25d71869e59a04c1576efb74f5b5763f