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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/31 11:55:39

Modified files:
        .              : ChangeLog 
        server/asobj   : Object.cpp 

Log message:
        register natives despite swf version.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6111&r2=1.6112
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Object.cpp?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6111
retrieving revision 1.6112
diff -u -b -r1.6111 -r1.6112
--- ChangeLog   31 Mar 2008 11:48:38 -0000      1.6111
+++ ChangeLog   31 Mar 2008 11:55:39 -0000      1.6112
@@ -1,5 +1,6 @@
 2008-03-31 Sandro Santilli <address@hidden>
 
+       * server/asobj/Object.cpp: register natives despite swf version.
        * server/asobj/Global.cpp: register ASSetPropFlags native.
 
 2008-03-31 Benjamin Wolsey <address@hidden>

Index: server/asobj/Object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Object.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/asobj/Object.cpp     28 Mar 2008 16:37:44 -0000      1.47
+++ server/asobj/Object.cpp     31 Mar 2008 11:55:39 -0000      1.48
@@ -51,14 +51,26 @@
 attachObjectInterface(as_object& o)
 {
        VM& vm = o.getVM();
+
+       // We register natives despite swf version,
+
+       vm.registerNative(object_watch, 101, 0); 
+       vm.registerNative(object_unwatch, 101, 1); 
+       vm.registerNative(object_addproperty, 101, 2); 
+       vm.registerNative(as_object::valueof_method, 101, 3); 
+       vm.registerNative(as_object::tostring_method, 101, 4); 
+       vm.registerNative(object_hasOwnProperty, 101, 5); 
+       vm.registerNative(object_isPrototypeOf, 101, 6); 
+       vm.registerNative(object_isPropertyEnumerable, 101, 7); 
+
+       // Then will attach to the prototype based on version
+
        int target_version = vm.getSWFVersion();
 
        // Object.valueOf()
-       vm.registerNative(as_object::valueof_method, 101, 3);
        o.init_member("valueOf", vm.getNative(101, 3));
 
        // Object.toString()
-       vm.registerNative(as_object::tostring_method, 101, 4);
        o.init_member("toString", vm.getNative(101, 4));
 
        // Object.toLocaleString()
@@ -67,27 +79,21 @@
        if ( target_version  < 6 ) return;
 
        // Object.addProperty()
-       vm.registerNative(object_addproperty, 101, 2);
        o.init_member("addProperty", vm.getNative(101, 2));
 
        // Object.hasOwnProperty()
-       vm.registerNative(object_hasOwnProperty, 101, 5);
        o.init_member("hasOwnProperty", vm.getNative(101, 5));
 
        // Object.isPropertyEnumerable()
-       vm.registerNative(object_isPropertyEnumerable, 101, 7);
        o.init_member("isPropertyEnumerable", vm.getNative(101, 7));
 
        // Object.isPrototypeOf()
-       vm.registerNative(object_isPrototypeOf, 101, 6);
        o.init_member("isPrototypeOf", vm.getNative(101, 6));
 
        // Object.watch()
-       vm.registerNative(object_watch, 101, 0);
        o.init_member("watch", vm.getNative(101, 0));
 
        // Object.unwatch()
-       vm.registerNative(object_unwatch, 101, 1);
        o.init_member("unwatch", vm.getNative(101, 1));
 }