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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/23 08:37:03

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

Log message:
        use named strings when available.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5473&r2=1.5474
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.37&r2=1.38

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5473
retrieving revision 1.5474
diff -u -b -r1.5473 -r1.5474
--- ChangeLog   22 Jan 2008 21:23:14 -0000      1.5473
+++ ChangeLog   23 Jan 2008 08:37:01 -0000      1.5474
@@ -1,3 +1,7 @@
+2008-01-23 Sandro Santilli <address@hidden>
+
+       * server/asobj/LoadVars.cpp: use named strings when available.
+
 2008-01-22 Sandro Santilli <address@hidden>
 
        * extensions/dejagnu/dejagnu.cpp, extensions/gtk2/gtkext.cpp:

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/asobj/LoadVars.cpp   21 Jan 2008 20:55:56 -0000      1.37
+++ server/asobj/LoadVars.cpp   23 Jan 2008 08:37:02 -0000      1.38
@@ -37,6 +37,7 @@
 #include "VM.h"
 #include "Object.h" // for getObjectInterface
 #include "LoadThread.h"
+#include "namedStrings.h"
 
 #include <list>
 #include <boost/algorithm/string/case_conv.hpp>
@@ -226,10 +227,6 @@
 
     if ( _loadThreads.empty() ) return; // nothing to do
 
-    VM& vm = getVM();
-    string_table& st = vm.getStringTable();
-    string_table::key onDataKey = st.find(PROPNAME("onData"));
-
     for (LoadThreadList::iterator it=_loadThreads.begin();
             it != _loadThreads.end(); )
     {
@@ -260,7 +257,7 @@
             delete lt; // supposedly joins the thread...
 
             // might push_front on the list..
-            callMethod(onDataKey, dataVal);
+            callMethod(NSV::PROP_ON_DATA, dataVal);
 
 #ifdef DEBUG_LOADS
             log_debug("Completed load, _loadThreads have now " SIZET_FMT " 
elements", _loadThreads.size());
@@ -277,6 +274,7 @@
 #ifdef DEBUG_XML_LOADS
         log_debug("Clearing XML load checker interval timer");
 #endif
+       VM& vm = getVM();
         vm.getRoot().clear_interval_timer(_loadCheckerTimer);
         _loadCheckerTimer=0;
     }
@@ -312,9 +310,7 @@
 void
 LoadVars::addLoadVariablesThread(const std::string& urlstr, const char* 
postdata)
 {
-       string_table& st = getVM().getStringTable();
-       string_table::key loadedKey = st.find("loaded");
-       set_member(loadedKey, false);
+       set_member(NSV::PROP_LOADED, false);
 
        URL url(urlstr, get_base_url());
 
@@ -476,12 +472,6 @@
        as_object* thisPtr = fn.this_ptr.get();
        if ( ! thisPtr ) return as_value();
 
-       VM& vm = thisPtr->getVM();
-       string_table& st = vm.getStringTable();
-       string_table::key onLoadKey = st.find(PROPNAME("onLoad"));
-       string_table::key loadedKey = st.find("loaded");
-
-
        // See 
http://gitweb.freedesktop.org/?p=swfdec/swfdec.git;a=blob;f=libswfdec/swfdec_initialize.as
 
        as_value src; src.set_null();
@@ -489,17 +479,20 @@
 
        if ( ! src.is_null() )
        {
-               string_table::key decodeKey = st.find("decode");
+               VM& vm = thisPtr->getVM();
+               string_table& st = vm.getStringTable();
+               string_table::key decodeKey = st.find("decode"); // add to 
namedStrings ?
+
                as_value tmp(true);
-               thisPtr->set_member(loadedKey, tmp);
+               thisPtr->set_member(NSV::PROP_LOADED, tmp);
                thisPtr->callMethod(decodeKey, src);
-               thisPtr->callMethod(onLoadKey, tmp);
+               thisPtr->callMethod(NSV::PROP_ON_LOAD, tmp);
        }
        else
        {
                as_value tmp(true);
-               thisPtr->set_member(loadedKey, tmp);
-               thisPtr->callMethod(onLoadKey, tmp);
+               thisPtr->set_member(NSV::PROP_LOADED, tmp);
+               thisPtr->callMethod(NSV::PROP_ON_LOAD, tmp);
        }
 
        return as_value();