[Gnash-commit] gnash ChangeLog server/asobj/Stage.cpp testsuit...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/11 12:47:26

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

Log message:
                * server/asobj/Stage.cpp: Stage is not a class, but
                  just an object!
                * testsuite/actionscript.all/Stage.as: fix taking
                  SWF version into account.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2082
retrieving revision 1.2083
diff -u -b -r1.2082 -r1.2083
--- ChangeLog   11 Jan 2007 12:15:02 -0000      1.2082
+++ ChangeLog   11 Jan 2007 12:47:26 -0000      1.2083
@@ -1,5 +1,9 @@
 2007-01-11 Sandro Santilli <address@hidden>
 
+       * server/asobj/Stage.cpp: Stage is not a class, but
+         just an object!
+       * testsuite/actionscript.all/Stage.as: fix taking
+         SWF version into account.
        * server/asobj/ContextMenu.cpp: fixed method cases
        * testsuite/actionscript.all/ContextMenu.as: fix taking
          SWF version into account.

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/Stage.cpp      20 Nov 2006 21:44:24 -0000      1.3
+++ server/asobj/Stage.cpp      11 Jan 2007 12:47:26 -0000      1.4
@@ -36,8 +36,8 @@
 static void
 attachStageInterface(as_object& o)
 {
-       o.set_member("addlistener", &stage_addlistener);
-       o.set_member("removelistener", &stage_removelistener);
+       o.set_member("addListener", &stage_addlistener);
+       o.set_member("removeListener", &stage_removelistener);
 }
 
 static as_object*
@@ -87,6 +87,13 @@
 // extern (used by Global.cpp)
 void stage_class_init(as_object& global)
 {
+
+       static boost::intrusive_ptr<as_object> obj = new as_object();
+       attachStageInterface(*obj);
+       global.set_member("Stage", obj.get());
+
+#if 0 // Stage is NOT a class, but a simple object, see Stage.as
+
        // This is going to be the global Stage "class"/"function"
        static boost::intrusive_ptr<builtin_function> cl;
 
@@ -101,6 +108,7 @@
 
        // Register _global.Stage
        global.set_member("Stage", cl.get());
+#endif
 
 }
 

Index: testsuite/actionscript.all/Stage.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Stage.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/actionscript.all/Stage.as 5 Nov 2006 00:45:27 -0000       1.6
+++ testsuite/actionscript.all/Stage.as 11 Jan 2007 12:47:26 -0000      1.7
@@ -20,16 +20,30 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Stage.as,v 1.6 2006/11/05 00:45:27 rsavoye Exp $";
+rcsid="$Id: Stage.as,v 1.7 2007/01/11 12:47:26 strk Exp $";
 
 #include "check.as"
 
+#if OUTPUT_VERSION > 5
+check_equals (typeof(Stage), 'object');
+#else // Gnash doesn't register a Stage object if SWF < 6 !
+xcheck_equals (typeof(Stage), 'object');
+#endif
+
 var stageObj = new Stage;
+check_equals (typeof(stageObj), 'undefined');
 
-// test the Stage constuctor
-check (stageObj != undefined);
+#if OUTPUT_VERSION > 5
 
 // test the Stage::addlistener method
-check (stageObj.addlistener != undefined);
+check_equals (typeof(Stage.addListener), 'function');
 // test the Stage::removelistener method
-check (stageObj.removelistener != undefined);
+check_equals (typeof(Stage.removeListener), 'function');
+
+#else // OUTPUT_VERSION <= 5
+
+check_equals (typeof(Stage.addListener), 'undefined');
+check_equals (typeof(Stage.removeListener), 'undefined');
+
+#endif // OUTPUT_VERSION <= 5
+