gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...


From: Sandro Santilli
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
Date: Tue, 24 Apr 2007 07:25:20 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/24 07:25:20

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/misc-ming.all: action_execution_order_extend_test.c 
        testsuite/swfdec: PASSING gen_run_swfdec_testsuite.sh 

Log message:
                * server/sprite_instance.cpp (on_event): call user-defined 
function
                  even if clip-events have been found.
                * testsuite/misc-ming.all/action_execution_order_extend_test.c:
                  one more success.
                * testsuite/swfdec/PASSING: event-order.swf now succeeds.
                * testsuite/swfdec/gen_run_swfdec_testsuite.sh: match full lines
                  in the PASSING file, to avoid partial mathes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2977&r2=1.2978
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.252&r2=1.253
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/action_execution_order_extend_test.c?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/gen_run_swfdec_testsuite.sh?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2977
retrieving revision 1.2978
diff -u -b -r1.2977 -r1.2978
--- ChangeLog   24 Apr 2007 07:15:08 -0000      1.2977
+++ ChangeLog   24 Apr 2007 07:25:19 -0000      1.2978
@@ -1,5 +1,12 @@
 2007-04-24 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (on_event): call user-defined function
+         even if clip-events have been found.
+       * testsuite/misc-ming.all/action_execution_order_extend_test.c:
+         one more success.
+       * testsuite/swfdec/PASSING: event-order.swf now succeeds.
+       * testsuite/swfdec/gen_run_swfdec_testsuite.sh: match full lines
+         in the PASSING file, to avoid partial mathes.
        * server/shape.cpp: substitute hash_wrapper with std::map,
          cleanups.
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -b -r1.252 -r1.253
--- server/sprite_instance.cpp  23 Apr 2007 20:05:20 -0000      1.252
+++ server/sprite_instance.cpp  24 Apr 2007 07:25:20 -0000      1.253
@@ -1933,7 +1933,7 @@
 
        bool called = false;
                        
-       // First, check for built-in event handler.
+       // First, check for clip event handler.
        {
                std::auto_ptr<ExecutableCode> code ( get_event_handler(id) );
                if ( code.get() )
@@ -1942,19 +1942,10 @@
                        code->execute();
 
                        called = true;
-                       // Fall through and call the function also, if it's 
defined!
-                       // (@@ Seems to be the behavior for mouse events; not 
tested & verified for
-                       // every event type.)
                }
        }
 
-       // If we called a built-in event handler
-       // we stop here. If we don't do this,
-       // MOUSE_UP, MOUSE_DOWN and MOUSE_MOVE will
-       // be called twice !
-       // Don't know if this is generally valid for every
-       // kind of event, but we do have testcases for this one...
-       if ( called ) return true;
+       // Fall through and call the function also, if it's defined!
 
        // Check for member function.
        {

Index: testsuite/misc-ming.all/action_execution_order_extend_test.c
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/action_execution_order_extend_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/action_execution_order_extend_test.c        11 Apr 
2007 14:20:21 -0000      1.7
+++ testsuite/misc-ming.all/action_execution_order_extend_test.c        24 Apr 
2007 07:25:20 -0000      1.8
@@ -157,7 +157,7 @@
   SWFMovie_nextFrame(mo); /* 4th frame */
   
   /* mc_red onload is only called IFF onClipEvent(load) is also defined! */
-  xcheck_equals(mo, "_root.y1", "'mc_red onLoad called'");
+  check_equals(mo, "_root.y1", "'mc_red onLoad called'");
   check_equals(mo, "_root.y1bis", "'mc_red onClipLoad called'");
   /* actions in main timeline is executed *after* mc_red.onEnterFrame */
   check_equals(mo, "_root.y2", "'as_in_root'");

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/swfdec/PASSING    19 Apr 2007 10:27:10 -0000      1.17
+++ testsuite/swfdec/PASSING    24 Apr 2007 07:25:20 -0000      1.18
@@ -55,3 +55,4 @@
 height4.swf
 divide-7.swf
 object-math-7.swf
+event-order.swf

Index: testsuite/swfdec/gen_run_swfdec_testsuite.sh
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/gen_run_swfdec_testsuite.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/swfdec/gen_run_swfdec_testsuite.sh        7 Mar 2007 15:11:24 
-0000       1.1
+++ testsuite/swfdec/gen_run_swfdec_testsuite.sh        24 Apr 2007 07:25:20 
-0000      1.2
@@ -45,7 +45,7 @@
 for test in \`ls ${SWFDECTRACEDIR}/*.swf\`; do
        testname=\`basename \${test}\`
        expectpass=no
-       if grep -q \${testname} \${EXPECTPASS}; then
+       if grep -q "^\${testname}\$" \${EXPECTPASS}; then
                expectpass="yes"
        fi
        echo "NOTE: running \${testname} (expect pass: \${expectpass})"




reply via email to

[Prev in Thread] Current Thread [Next in Thread]