[Gnash-commit] gnash ChangeLog server/as_object.cpp server/bui...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/31 14:34:38

Modified files:
        .              : ChangeLog 
        server         : as_object.cpp builtin_function.h 

Log message:
        don't lookup string_table for __proto__, constructor and 
__constructor__.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6118&r2=1.6119
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/gnash/server/builtin_function.h?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6118
retrieving revision 1.6119
diff -u -b -r1.6118 -r1.6119
--- ChangeLog   31 Mar 2008 13:59:12 -0000      1.6118
+++ ChangeLog   31 Mar 2008 14:34:38 -0000      1.6119
@@ -1,5 +1,10 @@
 2008-03-31 Sandro Santilli <address@hidden>
 
+       * server/: as_object.cpp, builtin_function.h: don't lookup string_table
+         for __proto__, constructor and __constructor__.
+
+2008-03-31 Sandro Santilli <address@hidden>
+
        * server/as_function.cpp: constructor and __constructor__ still exist
          in swf5, just not-visible. Reduce string_table lookups.
 

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- server/as_object.cpp        31 Mar 2008 11:58:46 -0000      1.108
+++ server/as_object.cpp        31 Mar 2008 14:34:38 -0000      1.109
@@ -954,7 +954,7 @@
        _vm(VM::get())
        //, m_prototype(proto)
 {
-       init_member("__proto__", as_value(proto));
+       init_member(NSV::PROP_uuPROTOuu, as_value(proto));
 }
 
 as_object::as_object(boost::intrusive_ptr<as_object> proto)
@@ -964,7 +964,7 @@
        //, m_prototype(proto)
 {
        //set_prototype(proto);
-       init_member("__proto__", as_value(proto));
+       init_member(NSV::PROP_uuPROTOuu, as_value(proto));
 }
 
 as_object::as_object(const as_object& other)

Index: server/builtin_function.h
===================================================================
RCS file: /sources/gnash/gnash/server/builtin_function.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/builtin_function.h   30 Mar 2008 12:55:47 -0000      1.16
+++ server/builtin_function.h   31 Mar 2008 14:34:38 -0000      1.17
@@ -20,6 +20,7 @@
 
 #include "as_function.h" // for inheritance
 #include "as_environment.h" // for FrameGuard
+#include "namedStrings.h"
 
 #include <cassert>
 
@@ -47,7 +48,7 @@
                as_function(),
                _func(func)
        {
-               init_member("constructor", 
as_function::getFunctionConstructor().get());
+               init_member(NSV::PROP_uuCONSTRUCTORuu, 
as_function::getFunctionConstructor().get());
        }
 
        /// Construct a builtin function/class with the given interface 
(possibly none)
@@ -70,11 +71,11 @@
        {
                if ( useThisAsCtor )
                {
-                       init_member("constructor", this);
+                       init_member(NSV::PROP_uuCONSTRUCTORuu, this);
                }
                else
                {
-                       init_member("constructor", 
as_function::getFunctionConstructor().get());
+                       init_member(NSV::PROP_uuCONSTRUCTORuu, 
as_function::getFunctionConstructor().get());
                }
        }