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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/08 16:36:56

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/misc-mtasc.all: Makefile.am level5.as level99.as 
Added files:
        testsuite/misc-mtasc.all: level87.as 

Log message:
        properly compute level number when we're the root movie.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5341&r2=1.5342
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.431&r2=1.432
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/Makefile.am?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/level5.as?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/level99.as?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/level87.as?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5341
retrieving revision 1.5342
diff -u -b -r1.5341 -r1.5342
--- ChangeLog   8 Jan 2008 12:09:08 -0000       1.5341
+++ ChangeLog   8 Jan 2008 16:36:55 -0000       1.5342
@@ -1,5 +1,13 @@
 2008-01-08 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (loadMovie): properly compute
+         level number when we're the root movie.
+       * testsuite/misc-mtasc.all/: Makefile.am, level5.as, level87.as,
+         level99.as: add test for loading a moving into an existing
+         level.
+
+2008-01-08 Sandro Santilli <address@hidden>
+
        * testsuite/swfdec/PASSING: synced with master git (except
          I had to skip movieclip-version-* tests to avoid timeouts..)
        * testsuite/misc-ming.all/loadMovieTestRunner.cpp: advance after

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -b -r1.431 -r1.432
--- server/sprite_instance.cpp  8 Jan 2008 11:35:02 -0000       1.431
+++ server/sprite_instance.cpp  8 Jan 2008 16:36:55 -0000       1.432
@@ -3888,7 +3888,7 @@
        else
        {
                movie_root& root = _vm.getRoot();
-               unsigned int level = get_depth();
+               unsigned int level = get_depth()-character::staticDepthOffset;
                
 #ifndef GNASH_USE_GC
                // Make sure we won't kill ourself !

Index: testsuite/misc-mtasc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- testsuite/misc-mtasc.all/Makefile.am        30 Nov 2007 18:04:06 -0000      
1.23
+++ testsuite/misc-mtasc.all/Makefile.am        8 Jan 2008 16:36:55 -0000       
1.24
@@ -42,6 +42,7 @@
 AUXMOVIES = \
            level5.as \
            level99.as \
+           level87.as \
            $(NULL)
 
 EXTRA_DIST = $(ASTESTS) $(AUXMOVIES) TestClass.as ../check.h Dejagnu.as 
check.as Derived1.as Base1.as  implementsOp/BExtendingImplementation.as  
implementsOp/ImplementationA.as  implementsOp/ImplementationB.as 
implementsOp/SimpleInterface.as

Index: testsuite/misc-mtasc.all/level5.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/level5.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/misc-mtasc.all/level5.as  23 Dec 2007 22:29:57 -0000      1.9
+++ testsuite/misc-mtasc.all/level5.as  8 Jan 2008 16:36:55 -0000       1.10
@@ -77,5 +77,7 @@
 
                 // load yet another swf
                 getURL("level99.swf","_level"+99);
+
+               getURL("level87.swf", "_level87");
        }
 }

Index: testsuite/misc-mtasc.all/level99.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/level99.as,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/misc-mtasc.all/level99.as 8 Jan 2008 07:58:50 -0000       1.11
+++ testsuite/misc-mtasc.all/level99.as 8 Jan 2008 16:36:56 -0000       1.12
@@ -108,7 +108,7 @@
                mc.ch.l99ref = level99ref;
                mc.ch.onEnterFrame = function()
                {
-                       note(this+".enterFrame -- l5ref is "+this.l5ref+" -- 
l99ref is "+this.l99ref);
+                       //note(this+".enterFrame -- l5ref is "+this.l5ref+" -- 
l99ref is "+this.l99ref);
                        if ( this.count > 4 )
                        {
                                check_equals(this.l5ref._target, '_level16394');
@@ -126,7 +126,7 @@
                                //  - sane swapping between to levels,
                                //  - swapping & removing _level0 
                                //  
-                               check_totals(49);
+                               check_totals(59);
                                Dejagnu.done();
                                delete this.onEnterFrame;
                        }

Index: testsuite/misc-mtasc.all/level87.as
===================================================================
RCS file: testsuite/misc-mtasc.all/level87.as
diff -N testsuite/misc-mtasc.all/level87.as
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-mtasc.all/level87.as 8 Jan 2008 16:36:55 -0000       1.1
@@ -0,0 +1,57 @@
+// level5.as - Data file for the levels.as test
+//
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+//
+// Original author: David Rorex - address@hidden
+//
+
+#include "check.as"
+
+class Level87
+{
+       static function main(mc)
+       {
+
+                check_equals(mc._currentframe, 1);
+
+                check_equals(_level0._currentframe, 1);
+
+                // Check our depth
+               check_equals(mc.getDepth(), -16297);
+
+                // The ""+ is there to force conversion to a string
+                check_equals(""+mc, "_level87");
+
+               if (_level0.level87loaded )
+               {
+                       check_equals(typeof(_level5), 'undefined');
+                       return;
+               }
+
+               _level0.level87loaded = true;
+
+               // This one fails because gnash is executing code
+               // in level99 before code in the first load of level87,
+               // probably because it is *loading* level99 before level87,
+               // which is in the order loads are requested rather then
+               // reverse of it as it's common...
+                xcheck_equals(_level5._currentframe, 1);
+
+               _level87.loadMovie("level87.swf");
+       }
+}