[Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Drawing...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/06 11:00:36

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

Log message:
                * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: add test for
                  setMask and invisible shapes (gnash fails).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4775&r2=1.4776
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4775
retrieving revision 1.4776
diff -u -b -r1.4775 -r1.4776
--- ChangeLog   6 Nov 2007 09:06:00 -0000       1.4775
+++ ChangeLog   6 Nov 2007 11:00:36 -0000       1.4776
@@ -1,3 +1,8 @@
+2007-11-06 Sandro Santilli <address@hidden>
+
+       * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: add test for
+         setMask and invisible shapes (gnash fails).
+
 2007-11-06 Benjamin Wolsey <address@hidden>
 
        * macros/freetype.m4: use fontconfig to find a default sans font for

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp    5 Nov 2007 17:26:30 
-0000       1.26
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp    6 Nov 2007 11:00:36 
-0000       1.27
@@ -26,6 +26,7 @@
 #include "dlist.h"
 #include "container.h"
 #include "log.h"
+#include "gnash.h" // for gnash::key::code
 
 #include "check.h"
 #include <string>
@@ -441,7 +442,19 @@
        check_pixel(c3b.x, c3b.y, 1, yellow, 2); 
 
        //--------------------------------------------------------------
-       // Check setMask effect (triggered onMouseDown)
+       // Check _visible toggling effects
+       // (triggered onKeyDown 'h', effects visible after advance)
+       //--------------------------------------------------------------
+
+       check_pixel(330, 160, 2, green, 2); 
+       tester.pressKey(gnash::key::h); tester.advance();
+       check_pixel(330, 160, 2, white, 2); 
+       tester.pressKey(gnash::key::h); tester.advance();
+       check_pixel(330, 160, 2, green, 2); 
+
+       //--------------------------------------------------------------
+       // Check setMask effect
+       // (triggered onMouseDown, effects visible after advance)
        //--------------------------------------------------------------
 
        tester.click(); // this should enable cursor shape masking drawing
@@ -464,6 +477,33 @@
        tester.movePointerTo(146, 146); tester.advance(); // move the mask over 
it
        check_pixel(146, 146, 2, red, 2);
 
+       // Inside the violet fill
+       check_pixel(250, 112, 2, white, 2);
+       tester.click(); // this should disable the mask
+       check_pixel(250, 112, 2, violet, 2);
+
+       //--------------------------------------------------------------
+       // Check setMask on invisible shape 
+       //--------------------------------------------------------------
+
+       tester.movePointerTo(146, 146); // move pointer over red shape
+       tester.click(); // enable the mask
+       tester.advance(); // commit all of the above
+       check_pixel(146, 146, 2, red, 2);
+
+       tester.pressKey(gnash::key::h); // make it invisible
+       tester.advance(); // commit 
+       xcheck_pixel(146, 146, 2, white, 2); // gnash still draws invisible 
dynamic maskees !
+
+       tester.pressKey(gnash::key::h); // make it visible again
+       tester.advance(); // commit 
+       check_pixel(146, 146, 2, red, 2);
+
+
+       //--------------------------------------------------------------
+       // TODO: go to drawing #2 (hit the '2' ascii key)
+       //       and test rendering of those invalid shapes.
+       //--------------------------------------------------------------
 
 }