[Gnash-commit] gnash ChangeLog server/asobj/MovieClipLoader.cp...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/25 18:56:06

Modified files:
        .              : ChangeLog 
        server/asobj   : MovieClipLoader.cpp 
        testsuite/actionscript.all: MovieClipLoader.as 

Log message:
        Add test for _lockroot

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5254&r2=1.5255
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClipLoader.as?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5254
retrieving revision 1.5255
diff -u -b -r1.5254 -r1.5255
--- ChangeLog   25 Dec 2007 07:47:09 -0000      1.5254
+++ ChangeLog   25 Dec 2007 18:56:05 -0000      1.5255
@@ -1,3 +1,9 @@
+2007-12-25 Sandro Santilli <address@hidden>
+
+       * server/asobj/MovieClipLoader.cpp: remove dead code.
+       * testsuite/actionscript.all/MovieClipLoader.as: add test for
+         _lockroot.
+
 2007-12-25 Zou Lunkai <address@hidden>
        
        * server/movie_root.cpp: flushHigherPriorityActionQueues(), only flush 
when

Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/asobj/MovieClipLoader.cpp    24 Dec 2007 14:00:31 -0000      1.41
+++ server/asobj/MovieClipLoader.cpp    25 Dec 2007 18:56:06 -0000      1.42
@@ -122,15 +122,6 @@
 
        void unloadClip(void *);
 
-       /// @todo make an EventDispatcher class for this
-       /// @ {
-       ///
-
-       /// Invoke any listener for the specified event
-       void dispatchEvent(const std::string& eventName, const as_value& arg);
-
-       /// @ }
-
 protected:
 
 #if 0
@@ -195,8 +186,6 @@
        log_msg(_(" resolved url: %s"), url.str().c_str());
 #endif
                         
-       string_table& st = _vm.getStringTable();
-
        as_value targetVal(&target);
        log_debug("Target is %s", targetVal.to_debug_string().c_str());
 
@@ -248,16 +237,6 @@
   GNASH_REPORT_FUNCTION;
 }
 
-// Callbacks
-void
-MovieClipLoader::dispatchEvent(const std::string& event, const as_value& arg)
-{
-       as_value ev(event);
-
-       log_debug("dispatchEvent calling broadcastMessage with args %s and %s", 
ev.to_debug_string().c_str(), arg.to_debug_string().c_str());
-       callMethod(NSV::PROP_BROADCAST_MESSAGE, ev, arg);
-}
-
 static as_value
 moviecliploader_loadclip(const fn_call& fn)
 {

Index: testsuite/actionscript.all/MovieClipLoader.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClipLoader.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/actionscript.all/MovieClipLoader.as       24 Dec 2007 14:00:31 
-0000      1.9
+++ testsuite/actionscript.all/MovieClipLoader.as       25 Dec 2007 18:56:06 
-0000      1.10
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClipLoader.as,v 1.9 2007/12/24 14:00:31 strk Exp $";
+rcsid="$Id: MovieClipLoader.as,v 1.10 2007/12/25 18:56:06 strk Exp $";
 
 #include "check.as"
 
@@ -230,6 +230,21 @@
        check_equals(state.onLoadCompleteCalls, 1);
        state.onLoadInitCalls++;
 
+       if ( target._url = MEDIA(green.jpg) )
+       {
+               with (target)
+               {
+                       note("---- Target's root is "+_root);
+                       xcheck_equals(_root, _level0);
+                       _lockroot = true;
+                       check_equals(_root, _level0.loadtarget);
+                       note("---- After setting _lockroot to true, target's 
root is "+_root);
+                       _lockroot = false;
+                       xcheck_equals(_root, _level0);
+                       note("---- After setting _lockroot to false, target's 
root is "+_root);
+               }
+       }
+
        //note("target.var1: "+target.var1);
        //note("onLoadInit called with "+arguments.length+" args:"); 
dumpObj(arguments);
        nextTestOrEnd();
@@ -273,7 +288,7 @@
        // subtract the number of progress callback runs reported when playing 
from the totals to get the correct number
        // BUT MAKE SURE nextTestOrEnd CONTAINS THE CORRECT 
testsPerProgressCallback INFO !!
        //
-       expected.totals = 59;
+       expected.totals = 65;
        // gnash doesn't call onLoadInit if the data at the url is not an SWF 
or JPG
        // (or whatever else can become a movie_instance), while the PP does.
        // So in this testcase, the attempt to load vars.txt is invalid for 
Gnash