[Gnash-commit] gnash ChangeLog server/as_value.cpp testsuite/a...

[Sandro Santilli]

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

Modified files:
        .              : ChangeLog 
        server         : as_value.cpp 
        testsuite/actionscript.all: MovieClipLoader.as 

Log message:
                * server/as_value.cpp (to_string): movieclips oughta evaluate
                  to the empty string only if dangling and not rebound.
                * testsuite/actionscript.all/MovieClipLoader.as: test that 
rebound
                  soft refs convert to non-empty string.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5655&r2=1.5656
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClipLoader.as?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5655
retrieving revision 1.5656
diff -u -b -r1.5655 -r1.5656
--- ChangeLog   14 Feb 2008 19:17:00 -0000      1.5655
+++ ChangeLog   14 Feb 2008 21:10:16 -0000      1.5656
@@ -1,5 +1,12 @@
 2008-02-14 Sandro Santilli <address@hidden>
 
+       * server/as_value.cpp (to_string): movieclips oughta evaluate
+         to the empty string only if dangling and not rebound.
+       * testsuite/actionscript.all/MovieClipLoader.as: test that rebound
+         soft refs convert to non-empty string.
+
+2008-02-14 Sandro Santilli <address@hidden>
+
        * server/parser/BitmapMovieDefinition.h: advertise one frame loaded,
          fixes last failure in loadMovieTest.swf.
        * server/sprite_instance.cpp (loadMovie): copy clip-events to loaded

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- server/as_value.cpp 21 Jan 2008 20:55:49 -0000      1.113
+++ server/as_value.cpp 14 Feb 2008 21:10:18 -0000      1.114
@@ -118,7 +118,7 @@
                case MOVIECLIP:
                {
                        const CharacterProxy& sp = getCharacterProxy();
-                       if ( sp.isDangling() )
+                       if ( ! sp.get() )
                        {
                                return "";
                        }

Index: testsuite/actionscript.all/MovieClipLoader.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClipLoader.as,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/actionscript.all/MovieClipLoader.as       11 Feb 2008 08:33:38 
-0000      1.16
+++ testsuite/actionscript.all/MovieClipLoader.as       14 Feb 2008 21:10:18 
-0000      1.17
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClipLoader.as,v 1.16 2008/02/11 08:33:38 strk Exp $";
+rcsid="$Id: MovieClipLoader.as,v 1.17 2008/02/14 21:10:18 strk Exp $";
 
 #include "check.as"
 
@@ -171,6 +171,10 @@
 mcl.onLoadStart = function(target)
 {
        check_equals(arguments.length, 1);
+       // a bug in Gnash made softrefs always convert
+       // to the empty string when not pointing to
+       // their original target...
+       check(target+"" != "");
        check_equals(target, expected.target);
        state.onLoadStartCalls++;
        note("onLoadStart("+target+", "+target._url+") called");
@@ -311,7 +315,7 @@
        // subtract the number of progress callback runs reported when playing 
from the totals to get the correct number
        // BUT MAKE SURE nextTestOrEnd CONTAINS THE CORRECT 
testsPerProgressCallback INFO !!
        //
-       expected.totals = 70;
+       expected.totals = 72;
        // gnash doesn't call onLoadInit if the data at the url is not an SWF 
or JPG
        // (or whatever else can become a movie_instance), while the PP does.
        // So in this testcase, the attempt to load vars.txt is invalid for 
Gnash