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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/30 09:38:34

Modified files:
        .              : ChangeLog 
        server         : dlist.cpp 
        testsuite/misc-ming.all: masks_testrunner.cpp 

Log message:
                * server/dlist.cpp (display): don't render dynamic masks.
                * testsuite/misc-ming.all/masks_testrunner.cpp: no more 
failures here.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4740&r2=1.4741
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_testrunner.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4740
retrieving revision 1.4741
diff -u -b -r1.4740 -r1.4741
--- ChangeLog   30 Oct 2007 09:23:41 -0000      1.4740
+++ ChangeLog   30 Oct 2007 09:38:33 -0000      1.4741
@@ -1,5 +1,10 @@
 2007-10-30 Sandro Santilli <address@hidden>
 
+       * server/dlist.cpp (display): don't render dynamic masks.
+       * testsuite/misc-ming.all/masks_testrunner.cpp: no more failures here.
+
+2007-10-30 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/masks_testrunner.cpp: add tests for effects
          of swapDepth on dynamic masks (gnash fails).
 

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- server/dlist.cpp    29 Oct 2007 21:23:16 -0000      1.99
+++ server/dlist.cpp    30 Oct 2007 09:38:33 -0000      1.100
@@ -772,6 +772,12 @@
                        continue;
                }
 
+               // Don't display dynamic masks
+               if ( ch->isDynamicMask() )
+               {
+                       continue;
+               }
+
                assert(! ch->isUnloaded() ); // we don't advance unloaded chars
 
                // Check if this charater or any of its parents is a mask.

Index: testsuite/misc-ming.all/masks_testrunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/masks_testrunner.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/misc-ming.all/masks_testrunner.cpp        30 Oct 2007 09:23:42 
-0000      1.8
+++ testsuite/misc-ming.all/masks_testrunner.cpp        30 Oct 2007 09:38:34 
-0000      1.9
@@ -191,7 +191,7 @@
        check_pixel(214,232, 2, white, 2);
        // 248,232 = cyan (visible in its green mask)
        check( invalidated.contains(248, 232) );
-       xcheck_pixel(248,232, 2, cyan, 2);
+       check_pixel(248,232, 2, cyan, 2);
        // 276,232 = white (cyan not covered by its green mask)
        check( invalidated.contains(276, 232) );
        check_pixel(276,232, 2, white, 2);
@@ -201,7 +201,7 @@
        check_pixel(14,331, 2, white, 2);
        // 48,331 = blue (visible in its violet mask)
        check( invalidated.contains(48, 331) );
-       xcheck_pixel(48,331, 2, blue, 2);
+       check_pixel(48,331, 2, blue, 2);
        // 80,331 = white (blue not covered by its violet mask)
        check( invalidated.contains(80, 331) );
        check_pixel(80,331, 2, white, 2);