[Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp tests...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/26 10:51:52

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

Log message:
                * testsuite/MovieTester.cpp: call display() before advancing
                  to make invalidated bounds computation properly work.
                * testsuite/misc-ming.all/simple_loop_testrunner.cpp:
                  don't expect a failure about invalidated bounds at loopback.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2179&r2=1.2180
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/simple_loop_testrunner.cpp?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2179
retrieving revision 1.2180
diff -u -b -r1.2179 -r1.2180
--- ChangeLog   26 Jan 2007 10:10:50 -0000      1.2179
+++ ChangeLog   26 Jan 2007 10:51:52 -0000      1.2180
@@ -1,5 +1,9 @@
 2007-01-25 Sandro Santilli <address@hidden>
 
+       * testsuite/MovieTester.cpp: call display() before advancing
+         to make invalidated bounds computation properly work.
+       * testsuite/misc-ming.all/simple_loop_testrunner.cpp:
+         don't expect a failure about invalidated bounds at loopback.
        * server/character.h: more info about invalidated bounds
          methods and members.
 

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/MovieTester.cpp   10 Jan 2007 17:28:50 -0000      1.17
+++ testsuite/MovieTester.cpp   26 Jan 2007 10:51:52 -0000      1.18
@@ -87,6 +87,23 @@
 void
 MovieTester::advance() 
 {
+       // We call display here to simulate effect of a real run.
+       //
+       // What we're particularly interested about is 
+       // proper computation of invalidated bounds, which
+       // needs clear_invalidated() to be called.
+       // display() will call clear_invalidated() on characters
+       // actually modified so we're fine with that.
+       //
+       // Directly calling _movie->clear_invalidated() here
+       // also work currently, as invalidating the topmost
+       // movie will force recomputation of all invalidated
+       // bounds. Still, possible future changes might 
+       // introduce differences, so better to reproduce
+       // real runs as close as possible, by calling display().
+       //
+       _movie->display();
+
        _movie->advance(1.0);
 #ifdef SHOW_INVALIDATED_BOUNDS_ON_ADVANCE
        geometry::Range2d<float> invalidatedbounds = getInvalidatedBounds();
@@ -95,6 +112,7 @@
        gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
        dbglogfile << ss.str().c_str() << std::endl;
 #endif
+
 }
 
 const character*

Index: testsuite/misc-ming.all/simple_loop_testrunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/simple_loop_testrunner.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/simple_loop_testrunner.cpp  25 Jan 2007 15:01:39 
-0000      1.2
+++ testsuite/misc-ming.all/simple_loop_testrunner.cpp  26 Jan 2007 10:51:52 
-0000      1.3
@@ -95,7 +95,7 @@
        check_equals(root->get_current_frame(), 0);
        check_equals(root->getDisplayList().size(), 0);
        invalidated = tester.getInvalidatedBounds();
-       xcheck( invalidated.intersects(Bounds(0, 0, 180, 60)) );
+       check( invalidated.intersects(Bounds(0, 0, 180, 60)) );
 
        tester.advance(); // FRAME 2/4