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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/04 08:35:01

Modified files:
        .              : ChangeLog 
        testsuite      : MovieTester.cpp MovieTester.h 

Log message:
                * testsuite/MovieTester.{cpp,h}: add redraw() method,
                  by default only force a redraw on *first* advance.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3085&r2=1.3086
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3085
retrieving revision 1.3086
diff -u -b -r1.3085 -r1.3086
--- ChangeLog   3 May 2007 23:47:21 -0000       1.3085
+++ ChangeLog   4 May 2007 08:35:01 -0000       1.3086
@@ -1,3 +1,8 @@
+2007-05-03 Sandro Santilli <address@hidden>
+
+       * testsuite/MovieTester.{cpp,h}: add redraw() method,
+         by default only force a redraw on *first* advance.
+
 2007-05-03 Markus Gothe <address@hidden>
 
        * backend/render_handler_ogl.cpp: Make it work with __APPLE_CC__.

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- testsuite/MovieTester.cpp   24 Apr 2007 20:59:10 -0000      1.31
+++ testsuite/MovieTester.cpp   4 May 2007 08:35:01 -0000       1.32
@@ -50,6 +50,8 @@
 namespace gnash {
 
 MovieTester::MovieTester(const std::string& url)
+       :
+       _forceRedraw(true)
 {
        if ( url == "-" )
        {
@@ -128,6 +130,13 @@
 }
 
 void
+MovieTester::redraw()
+{
+       _forceRedraw=true;
+       render();
+}
+
+void
 MovieTester::render() 
 {
        // Get invalidated ranges and cache them
@@ -140,8 +149,12 @@
 #endif
 
        // Force full redraw by using a WORLD invalidated ranges
-       InvalidatedRanges ranges = _invalidatedBounds; // copy the cache, so we 
don't accidentally modify it ...
-       ranges.setWorld(); // TESTING !! TODO: make this a parameter
+       InvalidatedRanges ranges = _invalidatedBounds; 
+       if ( _forceRedraw )
+       {
+               ranges.setWorld(); // set to world if asked a full redraw
+               _forceRedraw = false; // reset to no forced redraw
+       }
 
        for (TRenderers::const_iterator it=_testingRenderers.begin(), 
itE=_testingRenderers.end();
                                it != itE; ++it)

Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- testsuite/MovieTester.h     23 Apr 2007 10:19:47 -0000      1.18
+++ testsuite/MovieTester.h     4 May 2007 08:35:01 -0000       1.19
@@ -105,6 +105,13 @@
        /// Advance the movie by one frame
        void advance();
 
+       /// Fully redraw of current frame
+       //
+       /// This function forces complete redraw in all testing
+       /// renderers.
+       ///
+       void redraw();
+
        /// Return the invalidated ranges in PIXELS
        //
        /// This is to debug/test partial rendering
@@ -261,6 +268,10 @@
        typedef std::vector< TestingRendererPtr > TRenderers;
 
        std::vector< TestingRendererPtr > _testingRenderers;
+
+       // When true, pass world invalidated ranges
+       // to the renderer(s) at ::render time.
+       bool _forceRedraw;
 };
 
 } // namespace gnash