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

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/12/25 07:47:10

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp 
        testsuite/misc-ming.all: key_event_test.c 
        testsuite/misc-swfc.all: gotoFrameFromInterval.sc 
                                 gotoFrameFromInterval2.sc 

Log message:
        * server/movie_root.cpp: flushHigherPriorityActionQueues(), only flush 
when
          we are processing an actions queue; 
notify_key_listeners(),notify_mouse_listeners(),
          executeTimers, process queued actions after finish all event handlers.
        * testsuite/misc-ming.all/key_event_test.c,
          testsuite/misc-swfc.all/gotoFrameFromInterval.sc, 
gotoFrameFromInterval2.sc:
          xchecks to checks.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5253&r2=1.5254
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/key_event_test.c?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/gotoFrameFromInterval.sc?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/gotoFrameFromInterval2.sc?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5253
retrieving revision 1.5254
diff -u -b -r1.5253 -r1.5254
--- ChangeLog   24 Dec 2007 18:21:24 -0000      1.5253
+++ ChangeLog   25 Dec 2007 07:47:09 -0000      1.5254
@@ -1,3 +1,12 @@
+2007-12-25 Zou Lunkai <address@hidden>
+       
+       * server/movie_root.cpp: flushHigherPriorityActionQueues(), only flush 
when
+         we are processing an actions queue; 
notify_key_listeners(),notify_mouse_listeners(),
+         executeTimers, process queued actions after finish all event handlers.
+       * testsuite/misc-ming.all/key_event_test.c,
+         testsuite/misc-swfc.all/gotoFrameFromInterval.sc, 
gotoFrameFromInterval2.sc:
+         xchecks to checks.
+         
 2007-12-24  Rob Savoye  <address@hidden>
 
        * server/asobj/SharedObject.cpp: Include cerrno.

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- server/movie_root.cpp       23 Dec 2007 22:29:56 -0000      1.139
+++ server/movie_root.cpp       25 Dec 2007 07:47:09 -0000      1.140
@@ -1078,6 +1078,12 @@
        }
 
     assert(testInvariant());
+
+    if( ! copy.empty() )
+       {
+               // process actions queued in the above step
+               processActionQueue();
+       }
 }
 
 /* static private */
@@ -1131,6 +1137,12 @@
        }
 
        assert(testInvariant());
+
+    if( ! copy.empty() )
+       {
+               // process actions queued in the above step
+               processActionQueue();
+       }
 }
 
 character*
@@ -1247,6 +1259,14 @@
 void
 movie_root::flushHigherPriorityActionQueues()
 {
+    if( ! processingActions() )
+       {
+               // only flush the actions queue when we are processing the 
queue.
+               // ie. we don't want to flush the queue during executing user 
event handlers,
+               // which are not pushed at the moment.
+               return;
+       }
+
        if ( _disableScripts )
        {
                //log_debug(_("Scripts are disabled, global instance list has 
%d elements"), _liveChars.size());
@@ -1385,6 +1405,12 @@
                it = nextIterator;
        }
 
+    if( ! _intervalTimers.empty() )
+       {
+               // process actions queued when executing interval callbacks
+               processActionQueue();
+       }
+
 }
 
 #ifdef GNASH_USE_GC

Index: testsuite/misc-ming.all/key_event_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/key_event_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/misc-ming.all/key_event_test.c    26 Nov 2007 07:03:17 -0000      
1.9
+++ testsuite/misc-ming.all/key_event_test.c    25 Dec 2007 07:47:09 -0000      
1.10
@@ -321,7 +321,7 @@
   SWFDisplayItem_remove(it3);
   SWFMovie_nextFrame(mo);  // _root frame22
  
-  xcheck_equals(mo, "test5", 
"'0+ls3+ls2+ls1+obj1+ls1+obj2+ls2+obj3+obj1+obj2+obj3'");
+  check_equals(mo, "test5", 
"'0+ls3+ls2+ls1+obj1+ls1+obj2+ls2+obj3+obj1+obj2+obj3'");
   add_actions(mo, "totals(); stop();");
   SWFMovie_nextFrame(mo);  // _root frame23
   //Output movie

Index: testsuite/misc-swfc.all/gotoFrameFromInterval.sc
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-swfc.all/gotoFrameFromInterval.sc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/misc-swfc.all/gotoFrameFromInterval.sc    18 Dec 2007 06:59:08 
-0000      1.9
+++ testsuite/misc-swfc.all/gotoFrameFromInterval.sc    25 Dec 2007 07:47:09 
-0000      1.10
@@ -64,7 +64,7 @@
     .put clip3=mc1 // place a named sprite clip3
     
     .action:
-        xcheck_equals(asOrder, '0+1+2+3+4+1+2+3+4+1+2+3+4+');
+        check_equals(asOrder, '0+1+2+3+4+1+2+3+4+1+2+3+4+');
     .end
 
 
@@ -122,7 +122,7 @@
 .frame 10
     .action:
         stop();
-        xcheck_equals(_root.asOrder, 'x0xx1x234');
+        check_equals(_root.asOrder, 'x0xx1x234');
     .end
 
 .end // end of file

Index: testsuite/misc-swfc.all/gotoFrameFromInterval2.sc
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-swfc.all/gotoFrameFromInterval2.sc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-swfc.all/gotoFrameFromInterval2.sc   7 Dec 2007 12:39:20 
-0000       1.2
+++ testsuite/misc-swfc.all/gotoFrameFromInterval2.sc   25 Dec 2007 07:47:10 
-0000      1.3
@@ -71,7 +71,7 @@
     .put clip3=mc1 // place a named sprite clip3
     
     .action:
-        xcheck_equals(asOrder, '0+1+2+3+4+1+2+3+4+1+2+3+4+');
+        check_equals(asOrder, '0+1+2+3+4+1+2+3+4+1+2+3+4+');
     .end