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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/06 12:38:57

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

Log message:
                * server/dlist.cpp (display): don't display masked characters
                  if invisible.
                * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: fixed 
drawing
                  of invisible masked characters.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4777&r2=1.4778
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4777
retrieving revision 1.4778
diff -u -b -r1.4777 -r1.4778
--- ChangeLog   6 Nov 2007 12:02:56 -0000       1.4777
+++ ChangeLog   6 Nov 2007 12:38:56 -0000       1.4778
@@ -1,3 +1,10 @@
+2007-11-06 Sandro Santilli <address@hidden>
+
+       * server/dlist.cpp (display): don't display masked characters
+         if invisible.
+       * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: fixed drawing
+         of invisible masked characters.
+
 2007-11-06 Benjamin Wolsey <address@hidden>
 
        * macros/freetype.m4: clean up space before default filename.

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- server/dlist.cpp    30 Oct 2007 09:53:17 -0000      1.101
+++ server/dlist.cpp    6 Nov 2007 12:38:57 -0000       1.102
@@ -762,7 +762,7 @@
                assert(ch);
 
                character* mask = ch->getMask();
-               if ( mask && ! mask->isUnloaded() )
+               if ( mask && ch->get_visible() && ! mask->isUnloaded() )
                {
                        render::begin_submit_mask();
                        mask->display();

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp    6 Nov 2007 11:00:36 
-0000       1.27
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp    6 Nov 2007 12:38:57 
-0000       1.28
@@ -493,7 +493,7 @@
 
        tester.pressKey(gnash::key::h); // make it invisible
        tester.advance(); // commit 
-       xcheck_pixel(146, 146, 2, white, 2); // gnash still draws invisible 
dynamic maskees !
+       check_pixel(146, 146, 2, white, 2); // gnash failed drawing invisible 
dynamic maskees !
 
        tester.pressKey(gnash::key::h); // make it visible again
        tester.advance(); // commit