[Gnash-commit] gnash ChangeLog server/character.h testsuite/mi...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/03 07:42:59

Modified files:
        .              : ChangeLog 
        server         : character.h 
        testsuite/misc-swfc.all: movieclip_destruction_test2.sc 

Log message:
                * server/character.h: Add depthInRemovedZone() methods.
                * testsuite/misc-swfc.all/movieclip_destruction_test2.sc:
                  Additional tests, and a typo fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4193&r2=1.4194
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test2.sc?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4193
retrieving revision 1.4194
diff -u -b -r1.4193 -r1.4194
--- ChangeLog   3 Sep 2007 05:55:38 -0000       1.4193
+++ ChangeLog   3 Sep 2007 07:42:58 -0000       1.4194
@@ -1,3 +1,9 @@
+2007-09-03 Sandro Santilli <address@hidden>
+
+       * server/character.h: Add depthInRemovedZone() methods.
+       * testsuite/misc-swfc.all/movieclip_destruction_test2.sc:
+         Additional tests, and a typo fix.
+
 2007-09-03 Chad Musick <address@hidden>
 
        * backend/render_handler_agg_style.h Correct(maybe) the placement of the

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/character.h  1 Sep 2007 01:20:46 -0000       1.92
+++ server/character.h  3 Sep 2007 07:42:59 -0000       1.93
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.92 2007/09/01 01:20:46 strk Exp $ */
+/* $Id: character.h,v 1.93 2007/09/03 07:42:59 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -359,6 +359,18 @@
     ///
     static const int removedDepthOffset = -32769; // -32769;
     
+    /// Return true if the given depth is in the removed zone
+    static bool depthInRemovedZone(int depth)
+    {
+        return depth < staticDepthOffset;
+    }
+
+    /// Return true if this character's depth is in the removed zone
+    bool depthInRemovedZone()
+    {
+        return depthInRemovedZone(get_depth());
+    }
+    
     /// This value is used for m_clip_depth when the value has no meaning, ie.
     /// the character is not a mask. Depths below -16384 are illegal, so this
     /// value should not collide with real depths.  

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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-swfc.all/movieclip_destruction_test2.sc      2 Sep 2007 
07:23:52 -0000       1.7
+++ testsuite/misc-swfc.all/movieclip_destruction_test2.sc      3 Sep 2007 
07:42:59 -0000       1.8
@@ -85,6 +85,8 @@
     // Define a onUnload for mc2 and mc3
     mc2.onUnload = function ()  
     { 
+       _root.check_equals(mc2.getDepth(), -16387); // already shifted inside 
unload handler !
+       _root.check_equals(this.getDepth(), -16387); // ...
        _root.mc2UnlaodedCount++;     
        // mc2.testvar keeps alive as long as mc2 is alive
        _root.check_equals(mc2.testvar, 100); 
@@ -112,7 +114,7 @@
 
   .action: 
     xcheck_equals(mc2UnlaodedCount, 1); // mc2.onUnload triggered
-    xcheck_equals(mc2UnlaodedCount, 1); // mc3.onUnload triggered
+    xcheck_equals(mc3UnlaodedCount, 1); // mc3.onUnload triggered
     check_equals(mc1Ref.valueOf(), null);
     check_equals(mc2Ref, mc2);
     check_equals(mc3Ref, mc3);