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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/13 20:40:32

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/actionscript.all: MovieClip.as 

Log message:
                * server/sprite_instance.cpp (sprite_droptarget_getset):
                  Always return a string.
                * testsuite/actionscript.all/MovieClip.as: fixed expected 
results.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3739&r2=1.3740
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.297&r2=1.298
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.73&r2=1.74

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3739
retrieving revision 1.3740
diff -u -b -r1.3739 -r1.3740
--- ChangeLog   13 Jul 2007 20:32:06 -0000      1.3739
+++ ChangeLog   13 Jul 2007 20:40:31 -0000      1.3740
@@ -1,5 +1,11 @@
 2007-07-13 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (sprite_droptarget_getset): 
+         Always return a string.
+       * testsuite/actionscript.all/MovieClip.as: fixed expected results.
+
+2007-07-13 Sandro Santilli <address@hidden>
+
        * server/sprite_instance.cpp (sprite_create_text_field): when
          targetting SWF8, return the newly created TextField.
        * testsuite/actionscript.all/MovieClip.as: more successes.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -b -r1.297 -r1.298
--- server/sprite_instance.cpp  13 Jul 2007 20:32:06 -0000      1.297
+++ server/sprite_instance.cpp  13 Jul 2007 20:40:32 -0000      1.298
@@ -1370,14 +1370,8 @@
        }
 
        VM& vm = VM::get();
-       if ( vm.getSWFVersion() > 5 )
-       {
+       // NOTE: _droptarget should be set after startDrag() and stopDrag() 
calls
                return as_value("");
-       } 
-       else
-       {
-               return as_value();
-       }
 }
 
 static as_value

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- testsuite/actionscript.all/MovieClip.as     13 Jul 2007 20:32:07 -0000      
1.73
+++ testsuite/actionscript.all/MovieClip.as     13 Jul 2007 20:40:32 -0000      
1.74
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.73 2007/07/13 20:32:07 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.74 2007/07/13 20:40:32 strk Exp $";
 
 #include "check.as"
 
@@ -211,7 +211,6 @@
 check_equals(mc._alpha, 100);
 check(mc._currentframe != undefined);
 
-check_equals(mc._droptarget, "");
 if (typeof(mc._droptarget) != "string")
 {
        fail("typeof(mc._droptarget) = "+typeof(mc._droptarget)+" (expected 
'string') ["+__FILE__+":"+__LINE__+"]");