[Gnash-commit] gnash ChangeLog server/dlist.cpp testsuite/misc...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/31 14:49:48

Modified files:
        .              : ChangeLog 
        server         : dlist.cpp 
        testsuite/misc-swfc.all: Dejagnu.sc 
                                 movieclip_destruction_test2.sc 

Log message:
                * server/dlist.cpp (swapDeptsh): don't swap to depths in the
                  deleted characters zone.
                * testsuite/misc-swfc.all/movieclip_destruction_test2.sc:
                  less failures, few more tests.
                * testsuite/misc-swfc.all/Dejagnu.sc: include file:line info
                  in xpass too...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4170&r2=1.4171
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Dejagnu.sc?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4170
retrieving revision 1.4171
diff -u -b -r1.4170 -r1.4171
--- ChangeLog   31 Aug 2007 14:23:19 -0000      1.4170
+++ ChangeLog   31 Aug 2007 14:49:47 -0000      1.4171
@@ -1,5 +1,11 @@
 2007-08-31 Sandro Santilli <address@hidden>
 
+       * server/dlist.cpp (swapDeptsh): don't swap to depths in the
+         deleted characters zone.
+       * testsuite/misc-swfc.all/movieclip_destruction_test2.sc:
+         less failures, few more tests.
+       * testsuite/misc-swfc.all/Dejagnu.sc: include file:line info
+         in xpass too...
        * testsuite/misc-swfc.all/check.sc: define totals().
 
 2007-08-31 Zou Lunkai <address@hidden>

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- server/dlist.cpp    30 Aug 2007 21:21:58 -0000      1.79
+++ server/dlist.cpp    31 Aug 2007 14:49:47 -0000      1.80
@@ -415,10 +415,20 @@
        //dump();
 }
 
+// TODO: take character by ref ?
 void
 DisplayList::swapDepths(character* ch1, int newdepth)
 {
 
+       if ( newdepth < character::staticDepthOffset )
+       {
+               IF_VERBOSE_ASCODING_ERRORS(
+               log_aserror("%s.swapDepth(%d) : ignored call with target depth 
less then %d",
+                       ch1->getTarget().c_str(), newdepth, 
character::staticDepthOffset);
+               );
+               return;
+       }
+
        assert(ch1->get_depth() != newdepth);
 
        container_type::iterator it1 = find(_characters.begin(), 
_characters.end(), ch1);

Index: testsuite/misc-swfc.all/Dejagnu.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Dejagnu.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-swfc.all/Dejagnu.sc  9 Aug 2007 06:38:15 -0000       1.1
+++ testsuite/misc-swfc.all/Dejagnu.sc  31 Aug 2007 14:49:48 -0000      1.2
@@ -76,7 +76,7 @@
             xcheck_equals: function (obt, exp, msg) {
                 if(msg == null) msg = "";
                 if ( obt == exp ) 
-                    this.xpass(obt+' == '+exp);
+                    this.xpass(obt+' == '+exp+" "+msg);
                 else 
                     this.xfail('expected: '+exp+' , obtained: '+obt+" "+msg);
             },

Index: testsuite/misc-swfc.all/movieclip_destruction_test2.sc
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-swfc.all/movieclip_destruction_test2.sc      31 Aug 2007 
07:16:52 -0000      1.4
+++ testsuite/misc-swfc.all/movieclip_destruction_test2.sc      31 Aug 2007 
14:49:48 -0000      1.5
@@ -41,7 +41,7 @@
  */
 
 
-.flash  bbox=800x600 filename="movieclip_destruction_test2.swf" 
background=white version=7 fps=1
+.flash  bbox=800x600 filename="movieclip_destruction_test2.swf" 
background=white version=7 fps=12
 
 .frame 1
   .action:
@@ -169,8 +169,14 @@
     .put mc1 x = 100 y = 300 // Place mc1
     .action:
       check_equals(mc1.getDepth(), -16380);
-      mc1.swapDepths(-16400); // doesn't work, can't swap mc1 to a depth below 
-16384
-      xcheck_equals(mc1.getDepth(), -16380);
+      mc1.swapDepths(-16385); // doesn't work, can't swap mc1 to a depth below 
-16384
+      check_equals(mc1.getDepth(), -16380);
+      mc1.swapDepths(-16384); // works
+      check_equals(mc1.getDepth(), -16384);
+      mc1.swapDepths(-32769); // doesn't work, can't swap mc1 to a depth below 
-16384 
+      check_equals(mc1.getDepth(), -16384);
+      mc1.swapDepths(-402770); // doesn't work, can't swap mc1 to a depth 
below -16384 
+      check_equals(mc1.getDepth(), -16384);
     .end
 
 .frame 6