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

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/12/04 07:30:43

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        server/vm      : ASHandlers.cpp 
        testsuite/misc-swfc.all: mouse_drag_test.sc 

Log message:
        * server/sprite_instance.cpp, server/vm/ASHandlers.cpp: 
          sprite_startDrag(), ActionStartDragMovie(), mark the character as 
script
          transformed after start mouse dragging.
        * testsuite/misc-swfc.all/mouse_drag_test.sc: xchecks to checks, bug 
#20723
          also fixed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5075&r2=1.5076
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.403&r2=1.404
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.164&r2=1.165
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/mouse_drag_test.sc?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5075
retrieving revision 1.5076
diff -u -b -r1.5075 -r1.5076
--- ChangeLog   4 Dec 2007 05:26:17 -0000       1.5075
+++ ChangeLog   4 Dec 2007 07:30:42 -0000       1.5076
@@ -1,5 +1,13 @@
 2007-12-04 Zou Lunkai <address@hidden>
        
+       * server/sprite_instance.cpp, server/vm/ASHandlers.cpp: 
+         sprite_startDrag(), ActionStartDragMovie(), mark the character as 
script
+         transformed after start mouse dragging.
+       * testsuite/misc-swfc.all/mouse_drag_test.sc: xchecks to checks, bug 
#20723
+         also fixed.
+       
+2007-12-04 Zou Lunkai <address@hidden>
+       
        * testsuite/misc-swfc.all/Makefile.am, mouse_drag_test.sc: new test file
          for mouse dragging, fix this should help fixing zoonmheng.swf.
        * testsuite/misc-ming.all/loop_test10.c: more tests for name synthesis,

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -b -r1.403 -r1.404
--- server/sprite_instance.cpp  3 Dec 2007 16:17:49 -0000       1.403
+++ server/sprite_instance.cpp  4 Dec 2007 07:30:43 -0000       1.404
@@ -1341,6 +1341,10 @@
 
        drag_state st;
        st.setCharacter( sprite.get() );
+
+    // mark this character is transformed.
+    sprite->transformedByScript();
+
        if ( fn.nargs )
        {
                st.setLockCentered( fn.arg(0).to_bool() );

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- server/vm/ASHandlers.cpp    27 Nov 2007 22:06:03 -0000      1.164
+++ server/vm/ASHandlers.cpp    4 Dec 2007 07:30:43 -0000       1.165
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.164 2007/11/27 22:06:03 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.165 2007/12/04 07:30:43 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1271,6 +1271,8 @@
        character* tgt = env.find_target(env.top(0).to_string());
        if ( tgt )
        {
+               // mark this character is script transformed.
+        tgt->transformedByScript();
                st.setCharacter( tgt );
        }
        else

Index: testsuite/misc-swfc.all/mouse_drag_test.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/mouse_drag_test.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-swfc.all/mouse_drag_test.sc  4 Dec 2007 03:42:31 -0000       
1.1
+++ testsuite/misc-swfc.all/mouse_drag_test.sc  4 Dec 2007 07:30:43 -0000       
1.2
@@ -54,8 +54,8 @@
     .jump mc1 x=200 y=200 //MOVE
     .action:
         // static transformation does not work after startDrag
-        xcheck(mc1._x != 200);
-        xcheck(mc1._y != 200);
+        check(mc1._x != 200);
+        check(mc1._y != 200);
         mc1.stopDrag();
     .end
 
@@ -63,8 +63,8 @@
     .jump mc1 x=300 y=300
     .action:
         // static transformation does not work even after stopDrag
-        xcheck(mc1._x != 300);
-        xcheck(mc1._y != 300);
+        check(mc1._x != 300);
+        check(mc1._y != 300);
     .end
 
 .frame 5