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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/10 04:59:24

Modified files:
        .              : ChangeLog 
        server         : timers.cpp 
        testsuite/swfdec: PASSING 

Log message:
        Don't let process time shift interval timers. Fixes swfdec's 
setinterval.swf test

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5113&r2=1.5114
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.72&r2=1.73

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5113
retrieving revision 1.5114
diff -u -b -r1.5113 -r1.5114
--- ChangeLog   9 Dec 2007 20:40:49 -0000       1.5113
+++ ChangeLog   10 Dec 2007 04:59:23 -0000      1.5114
@@ -1,3 +1,10 @@
+2007-12-10 Sandro Santilli <address@hidden>
+
+       * server/timers.cpp (expired): add interval to start time
+         when expired (rather then using current time); expire
+         also when start+interval == now.
+       * testsuite/swfdec/PASSING: setinterval.swf succeeds.
+
 2007-12-09 Sandro Santilli <address@hidden>
 
        * server/timers.{cpp,h}: let 0 be a valid start timer

Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/timers.cpp   9 Dec 2007 20:40:49 -0000       1.41
+++ server/timers.cpp   10 Dec 2007 04:59:24 -0000      1.42
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: timers.cpp,v 1.41 2007/12/09 20:40:49 strk Exp $ */
+/* $Id: timers.cpp,v 1.42 2007/12/10 04:59:24 strk Exp $ */
 
 #include "timers.h"
 #include "as_function.h" // for class as_function
@@ -96,9 +96,10 @@
                assert(now >= _start); // it is possible for now to be == 
_start 
 
                //cout << "Start is " << _start << " interval is " << _interval 
<< " now is " << now << endl;
-               if (now > _start + _interval)
+               if (now >= _start + _interval)
                {
-                       _start = now; // reset the timer
+                       // TODO: set _start to save lost time in calling 
expired ?
+                       _start += _interval; // reset the timer
                        //cout << " Expired, reset start to " << _start << endl;
                        //log_msg("Timer expired! \n");
                        return true;

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- testsuite/swfdec/PASSING    8 Dec 2007 09:11:25 -0000       1.72
+++ testsuite/swfdec/PASSING    10 Dec 2007 04:59:24 -0000      1.73
@@ -495,6 +495,7 @@
 set-overwrite-global-7.swf:0800f9cb345cef741e02d47c4769453e
 setinterval-arguments.swf:bf5653c905e58846b5a9ee8841c3bcb3
 setinterval-clear.swf:7897b1f201377d65dbffe1ae8182479a
+setinterval.swf:dbbfeaa905278739001776269e287887
 settarget-5.swf:2fdaa96ec67a1041d36d552f91a41cd4
 settarget-6.swf:78786db5ba63f78996f63001501d46fe
 settarget-7.swf:9f0f1e71281e0adee53742a283654c11