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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/24 21:11:18

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/actionscript.all: MovieClip.as 

Log message:
                * server/sprite_instance.cpp: stubbed localToGlobal and setMask
                * testsuite/actionscript.all/MovieClip.as: test availability of
                  localToGlobal and setMask.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2987&r2=1.2988
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.254&r2=1.255
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.65&r2=1.66

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2987
retrieving revision 1.2988
diff -u -b -r1.2987 -r1.2988
--- ChangeLog   24 Apr 2007 21:02:20 -0000      1.2987
+++ ChangeLog   24 Apr 2007 21:11:18 -0000      1.2988
@@ -1,5 +1,8 @@
 2007-04-24 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp: stubbed localToGlobal and setMask
+       * testsuite/actionscript.all/MovieClip.as: test availability of
+         localToGlobal and setMask.
        * testsuite/misc-ming.all/: Makefile.am, DrawingApiTest.as,
          DrawingApiTestRunner.cpp: Prepared a test for invalidated
          bounds checking. Gnash clearly fails, but no actual automated

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -b -r1.254 -r1.255
--- server/sprite_instance.cpp  24 Apr 2007 08:52:55 -0000      1.254
+++ server/sprite_instance.cpp  24 Apr 2007 21:11:18 -0000      1.255
@@ -861,6 +861,36 @@
 }
 
 static as_value
+sprite_localToGlobal(const fn_call& fn)
+{
+       boost::intrusive_ptr<sprite_instance> sprite = 
ensureType<sprite_instance>(fn.this_ptr);
+       UNUSED(sprite);
+
+       static bool warned = false;
+       if ( ! warned )
+       {
+               log_unimpl("MovieClip.localToGlobal()");
+               warned=true;
+       }
+       return as_value();
+}
+
+static as_value
+sprite_setMask(const fn_call& fn)
+{
+       boost::intrusive_ptr<sprite_instance> sprite = 
ensureType<sprite_instance>(fn.this_ptr);
+       UNUSED(sprite);
+
+       static bool warned = false;
+       if ( ! warned )
+       {
+               log_unimpl("MovieClip.setMask()");
+               warned=true;
+       }
+       return as_value();
+}
+
+static as_value
 sprite_endFill(const fn_call& fn)
 {
        boost::intrusive_ptr<sprite_instance> sprite = 
ensureType<sprite_instance>(fn.this_ptr);
@@ -1262,9 +1292,11 @@
        o.init_member("getURL", new builtin_function(sprite_getURL));
        o.init_member("getBounds", new builtin_function(sprite_getBounds));
        o.init_member("globalToLocal", new 
builtin_function(sprite_globalToLocal));
+       o.init_member("localToGlobal", new 
builtin_function(sprite_localToGlobal));
        if ( target_version  < 6 ) return;
 
        // SWF6 or higher
+       o.init_member("setMask", new builtin_function(sprite_setMask));
        o.init_member("beginFill", new builtin_function(sprite_beginFill));
        o.init_member("beginGradientFill", new 
builtin_function(sprite_beginGradientFill));
        o.init_member("clear", new builtin_function(sprite_clear));

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- testsuite/actionscript.all/MovieClip.as     20 Apr 2007 10:03:12 -0000      
1.65
+++ testsuite/actionscript.all/MovieClip.as     24 Apr 2007 21:11:18 -0000      
1.66
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.65 2007/04/20 10:03:12 zoulunkai Exp $";
+rcsid="$Id: MovieClip.as,v 1.66 2007/04/24 21:11:18 strk Exp $";
 
 #include "check.as"
 
@@ -53,12 +53,13 @@
 // Check methods existance
 
 // SWF5 or higher
-check(mc.attachMovie);
-check(mc.getBytesLoaded);
-check(mc.getBytesTotal);
-check(mc.getBounds);
-check(mc.globalToLocal);
-check_equals(typeOf(mc.unloadMovie), 'function');
+check_equals(typeof(mc.attachMovie), 'function');
+check_equals(typeof(mc.getBytesLoaded), 'function');
+check_equals(typeof(mc.getBytesTotal), 'function');
+check_equals(typeof(mc.getBounds), 'function');
+check_equals(typeof(mc.globalToLocal), 'function');
+check_equals(typeof(mc.localToGlobal), 'function');
+check_equals(typeof(mc.unloadMovie), 'function');
 
 // This seems unavailable
 // when targetting SWF > 6
@@ -69,6 +70,7 @@
 #endif
 
 #if OUTPUT_VERSION >= 6
+       check_equals(typeof(mc.setMask), 'function');
        check_equals(typeof(mc.beginFill), 'function');
        check_equals(typeof(mc.beginGradientFill), 'function');
         check_equals(typeof(mc.clear), 'function');
@@ -112,8 +114,6 @@
     // maybe we should just NOT use the _root for this ?
     //check(mc.loadVariables != undefined);
 
-    xcheck(mc.localToGlobal);
-    xcheck(mc.setMask);
     check(mc.startDrag);
     check(mc.stopDrag);
     xcheck(mc.enabled);