[Gnash-commit] gnash ChangeLog server/asobj/SharedObject.cpp t...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/11 11:56:20

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

Log message:
                * server/asobj/SharedObject.cpp: fixed method cases
                * testsuite/actionscript.all/SharedObject.as: fix taking
                  SWF version into account.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2080&r2=1.2081
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SharedObject.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/SharedObject.as?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2080
retrieving revision 1.2081
diff -u -b -r1.2080 -r1.2081
--- ChangeLog   11 Jan 2007 11:26:50 -0000      1.2080
+++ ChangeLog   11 Jan 2007 11:56:20 -0000      1.2081
@@ -1,5 +1,8 @@
 2007-01-11 Sandro Santilli <address@hidden>
 
+       * server/asobj/SharedObject.cpp: fixed method cases
+       * testsuite/actionscript.all/SharedObject.as: fix taking
+         SWF version into account.
        * testsuite/actionscript.all/: Error.as, LoadVars.as:
          fix tests taking SWF version and case into account.
        * server/asobj/LoadVars.cpp: fix method case.

Index: server/asobj/SharedObject.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SharedObject.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/SharedObject.cpp       20 Nov 2006 21:44:24 -0000      1.3
+++ server/asobj/SharedObject.cpp       11 Jan 2007 11:56:20 -0000      1.4
@@ -38,10 +38,11 @@
 static void
 attachSharedObjectInterface(as_object& o)
 {
+       // TODO: clear, flush and getSize not in SWF<6 , it seems
        o.set_member("clear", &sharedobject_clear);
        o.set_member("flush", &sharedobject_flush);
-       o.set_member("getlocal", &sharedobject_getlocal);
-       o.set_member("getsize", &sharedobject_getsize);
+       o.set_member("getLocal", &sharedobject_getlocal);
+       o.set_member("getSize", &sharedobject_getsize);
 }
 
 static as_object*

Index: testsuite/actionscript.all/SharedObject.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/SharedObject.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/actionscript.all/SharedObject.as  5 Nov 2006 00:45:27 -0000       
1.6
+++ testsuite/actionscript.all/SharedObject.as  11 Jan 2007 11:56:20 -0000      
1.7
@@ -20,20 +20,36 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: SharedObject.as,v 1.6 2006/11/05 00:45:27 rsavoye Exp $";
+rcsid="$Id: SharedObject.as,v 1.7 2007/01/11 11:56:20 strk Exp $";
 
 #include "check.as"
 
 var sharedobjectObj = new SharedObject;
 
+#if OUTPUT_VERSION < 6
+
 // test the SharedObject constuctor
-check (sharedobjectObj != undefined);
+xcheck_equals (typeof(sharedobjectObj), 'object');
+
+// test the SharedObject::getlocal method
+check_equals (typeof(sharedobjectObj.getLocal), 'undefined');
+xcheck_equals (typeof(SharedObject.getLocal), 'function');
+
+#else // OUTPUT_VERSION >= 6
+
+// test the SharedObject constuctor
+check_equals (typeof(sharedobjectObj), 'object');
 
 // test the SharedObject::clear method
-check (sharedobjectObj.clear != undefined);
+check_equals (typeof(sharedobjectObj.clear), 'function');
 // test the SharedObject::flush method
-check (sharedobjectObj.flush != undefined);
+check_equals (typeof(sharedobjectObj.flush), 'function');
+
 // test the SharedObject::getlocal method
-check (sharedobjectObj.getlocal != undefined);
+xcheck_equals (typeof(sharedobjectObj.getLocal), 'undefined');
+check_equals (typeof(SharedObject.getLocal), 'function');
+
 // test the SharedObject::getsize method
-check (sharedobjectObj.getsize != undefined);
+check_equals (typeof(sharedobjectObj.getSize), 'function');
+
+#endif // OUTPUT_VERSION >= 6