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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/29 08:23:45

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp 
        testsuite      : MovieTester.cpp 
        testsuite/misc-ming.all: ButtonEventsTest-Runner.cpp 
                                 DefineEditTextVariableNameTest-Runner.cpp 
                                 RollOverOutTest-Runner.cpp 

Log message:
                * server/movie_root.cpp (advance):
                  Don't check delta_time, rather always call advance of
                  current_root. My plan is to have movie_root be just a
                  wrapper around movie_instance.
                * testsuite/MovieTester.cpp:
                  Activate verbosity to allow for self-contained testcases
                  to be taken into account; give initial kick to movie.
                * testsuite/misc-ming.all/: ButtonEventsTest-Runner.cpp,
                  DefineEditTextVariableNameTest-Runner.cpp,
                  RollOverOutTest-Runner.cpp:
                  Omit the initial ::advance(), MovieTester will take
                  care of that.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1812&r2=1.1813
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/RollOverOutTest-Runner.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1812
retrieving revision 1.1813
diff -u -b -r1.1812 -r1.1813
--- ChangeLog   29 Nov 2006 00:38:56 -0000      1.1812
+++ ChangeLog   29 Nov 2006 08:23:44 -0000      1.1813
@@ -1,3 +1,18 @@
+2006-11-29 Sandro Santilli <address@hidden>
+
+       * server/movie_root.cpp (advance):
+         Don't check delta_time, rather always call advance of
+         current_root. My plan is to have movie_root be just a
+         wrapper around movie_instance.
+       * testsuite/MovieTester.cpp:
+         Activate verbosity to allow for self-contained testcases
+         to be taken into account; give initial kick to movie.
+       * testsuite/misc-ming.all/: ButtonEventsTest-Runner.cpp,
+         DefineEditTextVariableNameTest-Runner.cpp,
+         RollOverOutTest-Runner.cpp:
+         Omit the initial ::advance(), MovieTester will take
+         care of that.
+
 2006-11-28 Sandro Santilli <address@hidden>
 
        * testsuite/Makefile.am: added -Iserver/vm

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/movie_root.cpp       28 Nov 2006 15:59:30 -0000      1.29
+++ server/movie_root.cpp       29 Nov 2006 08:23:44 -0000      1.30
@@ -427,34 +427,9 @@
 void
 movie_root::advance(float delta_time)
 {
-//            GNASH_REPORT_FUNCTION;
-
-
-//     if (m_on_event_load_called == false)
-//        {
-            // Must do loading events.  For child sprites this is
-            // done by the dlist, but root movies don't get added
-            // to a dlist, so we do it here.
-//            m_on_event_load_called = true;
-//            m_movie->on_event_load();
-//        }
-
-#if 0
-    // Must check the socket connection for data
-    if (m_on_event_xmlsocket_ondata_called == true) {
-        m_movie->on_event_xmlsocket_ondata();
-    }
-                       
-    if (m_on_event_xmlsocket_onxml_called == true) {
-        m_movie->on_event_xmlsocket_onxml();
-    }
+       // GNASH_REPORT_FUNCTION;
 
 
-    // Must check the progress of the MovieClip being loaded
-    if (m_on_event_load_progress_called == true) {
-        m_movie->on_event_load_progress();                             
-    }
-#endif
     if (m_interval_timers.size() > 0) {
         for (unsigned int i=0; i<m_interval_timers.size(); i++) {
             if (m_interval_timers[i]->expired()) {
@@ -466,27 +441,9 @@
         }
     }
                        
-// m_movie->advance(delta_time);
-
-               // Vitaly:
-               // onload event for root movieclip is executed after frame 1 
actions.
-               // onload event for child movieclip is executed before frame 1 
actions.
-               // that's why advance for root movieclip and child movieclip 
are different.
-    m_timer += delta_time;
                sprite_instance* current_root = m_movie.get();
                assert(current_root);
-               //current_root->advance_root(delta_time);
-
-
-//             current_root->advance(delta_time);
-                       m_time_remainder += delta_time;
-                       const float     frame_time = 1.0f / get_frame_rate();
-      if (m_time_remainder >= frame_time)
-                       {
-                               m_time_remainder -= frame_time;
                                current_root->advance(delta_time);
-                       }
-                       m_time_remainder = fmod(m_time_remainder, frame_time);
 
        assert(testInvariant());
 }

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/MovieTester.cpp   29 Nov 2006 00:38:56 -0000      1.11
+++ testsuite/MovieTester.cpp   29 Nov 2006 08:23:45 -0000      1.12
@@ -69,6 +69,14 @@
        _movie = root->get_root_movie();
        assert(_movie);
 
+       // Activate verbosity so that self-contained testcases are
+       // also used 
+       gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+       dbglogfile.setVerbosity(1);
+
+
+       // Now place the root movie on the stage
+       root->advance(1.0);
 }
 
 void

Index: testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp 22 Nov 2006 11:55:10 
-0000      1.7
+++ testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp 29 Nov 2006 08:23:45 
-0000      1.8
@@ -85,9 +85,6 @@
        string filename = INPUT_FILENAME;
        MovieTester tester(filename);
 
-       gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
-       dbglogfile.setVerbosity(1);
-
        sprite_instance* root = tester.getRootMovie();
        assert(root);
 
@@ -106,11 +103,6 @@
        check(!tester.isMouseOverMouseEntity());
        // TODO: check that pixel @ 60,60 is red !
 
-       // TODO: check why we need this !!
-       //       I wouldn't want the first advance to be needed
-       tester.advance();
-       check_equals(root->get_current_frame(), 0);
-
        for (int fno=0; fno<root->get_frame_count(); fno++)
        {
                const character* square_back = 
tester.findDisplayItemByDepth(*root, 1);

Index: testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp   21 Nov 
2006 00:25:47 -0000      1.7
+++ testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp   29 Nov 
2006 08:23:45 -0000      1.8
@@ -59,11 +59,6 @@
        tester.advance();
 
        check_equals(root->get_play_state(), sprite_instance::PLAY);
-       check_equals(root->get_current_frame(), 0);
-
-       tester.advance();
-
-       check_equals(root->get_play_state(), sprite_instance::PLAY);
        check_equals(root->get_current_frame(), 1);
 
        tester.advance();

Index: testsuite/misc-ming.all/RollOverOutTest-Runner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/RollOverOutTest-Runner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/RollOverOutTest-Runner.cpp  21 Nov 2006 00:25:47 
-0000      1.4
+++ testsuite/misc-ming.all/RollOverOutTest-Runner.cpp  29 Nov 2006 08:23:45 
-0000      1.5
@@ -39,10 +39,6 @@
        string filename = INPUT_FILENAME;
        MovieTester tester(filename);
 
-       // TODO: check why we need this !!
-       //       I wouldn't want the first advance to be needed
-       tester.advance();
-
        gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
        dbglogfile.setVerbosity(1);