Changeset 57227 in webkit

Timestamp:

Apr 7, 2010 1:37:59 PM (14 years ago)

Author:

oliver@apple.com

Message:

2010-04-07 Oliver Hunt <​oliver@apple.com>

Reviewed by Darin Adler.

Remove some unnecessary uses of commonJSGlobalData
​https://bugs.webkit.org/show_bug.cgi?id=37229

Pass the ExecState down to identifierFromNPIdentifier and update call sites

• bridge/NP_jsobject.cpp: (_NPN_Invoke): (_NPN_GetProperty): (_NPN_SetProperty): (_NPN_RemoveProperty): (_NPN_HasProperty): (_NPN_HasMethod):
• bridge/c/c_instance.cpp: (JSC::Bindings::CInstance::getPropertyNames):
• bridge/c/c_utility.cpp: (JSC::Bindings::identifierFromNPIdentifier):
• bridge/c/c_utility.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/NP_jsobject.cpp (modified) (7 diffs)
• bridge/c/c_instance.cpp (modified) (1 diff)
• bridge/c/c_utility.cpp (modified) (1 diff)
• bridge/c/c_utility.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-07  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Remove some unnecessary uses of commonJSGlobalData
+        https://bugs.webkit.org/show_bug.cgi?id=37229
+
+        Pass the ExecState down to identifierFromNPIdentifier and update call sites
+
+        * bridge/NP_jsobject.cpp:
+        (_NPN_Invoke):
+        (_NPN_GetProperty):
+        (_NPN_SetProperty):
+        (_NPN_RemoveProperty):
+        (_NPN_HasProperty):
+        (_NPN_HasMethod):
+        * bridge/c/c_instance.cpp:
+        (JSC::Bindings::CInstance::getPropertyNames):
+        * bridge/c/c_utility.cpp:
+        (JSC::Bindings::identifierFromNPIdentifier):
+        * bridge/c/c_utility.h:
+
 2010-04-07  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebCore/bridge/NP_jsobject.cpp

@@ -231 +231 @@
         ExecState* exec = rootObject->globalObject()->globalExec();
         JSLock lock(SilenceAssertionsOnly);
-        JSValue function = obj->imp->get(exec, identifierFromNPIdentifier(i->string()));
+        JSValue function = obj->imp->get(exec, identifierFromNPIdentifier(exec, i->string()));
         CallData callData;
         CallType callType = function.getCallData(callData);
@@ -312 +312 @@
         JSValue result;
         if (i->isString())
-            result = obj->imp->get(exec, identifierFromNPIdentifier(i->string()));
+            result = obj->imp->get(exec, identifierFromNPIdentifier(exec, i->string()));
         else
             result = obj->imp->get(exec, i->number());
@@ -346 +346 @@
         if (i->isString()) {
             PutPropertySlot slot;
-            obj->imp->put(exec, identifierFromNPIdentifier(i->string()), convertNPVariantToValue(exec, variant, rootObject), slot);
+            obj->imp->put(exec, identifierFromNPIdentifier(exec, i->string()), convertNPVariantToValue(exec, variant, rootObject), slot);
         } else
             obj->imp->put(exec, i->number(), convertNPVariantToValue(exec, variant, rootObject));
@@ -371 +371 @@
         IdentifierRep* i = static_cast<IdentifierRep*>(propertyName);
         if (i->isString()) {
-            if (!obj->imp->hasProperty(exec, identifierFromNPIdentifier(i->string()))) {
+            if (!obj->imp->hasProperty(exec, identifierFromNPIdentifier(exec, i->string()))) {
                 exec->clearException();
                 return false;
@@ -384 +384 @@
         JSLock lock(SilenceAssertionsOnly);
         if (i->isString())
-            obj->imp->deleteProperty(exec, identifierFromNPIdentifier(i->string()));
+            obj->imp->deleteProperty(exec, identifierFromNPIdentifier(exec, i->string()));
         else
             obj->imp->deleteProperty(exec, i->number());
@@ -407 +407 @@
         JSLock lock(SilenceAssertionsOnly);
         if (i->isString()) {
-            bool result = obj->imp->hasProperty(exec, identifierFromNPIdentifier(i->string()));
+            bool result = obj->imp->hasProperty(exec, identifierFromNPIdentifier(exec, i->string()));
             exec->clearException();
             return result;
@@ -438 +438 @@
         ExecState* exec = rootObject->globalObject()->globalExec();
         JSLock lock(SilenceAssertionsOnly);
-        JSValue func = obj->imp->get(exec, identifierFromNPIdentifier(i->string()));
+        JSValue func = obj->imp->get(exec, identifierFromNPIdentifier(exec, i->string()));
         exec->clearException();
         return !func.isUndefined();

trunk/WebCore/bridge/c/c_instance.cpp

@@ -304 +304 @@
 
         if (identifier->isString())
-            nameArray.add(identifierFromNPIdentifier(identifier->string()));
+            nameArray.add(identifierFromNPIdentifier(exec, identifier->string()));
         else
             nameArray.add(Identifier::from(exec, identifier->number()));

trunk/WebCore/bridge/c/c_utility.cpp

@@ -144 +144 @@
 }
 
-Identifier identifierFromNPIdentifier(const NPUTF8* name)
+Identifier identifierFromNPIdentifier(ExecState* exec, const NPUTF8* name)
 {
-    return Identifier(WebCore::JSDOMWindow::commonJSGlobalData(), convertUTF8ToUTF16WithLatin1Fallback(name, -1));
+    return Identifier(exec, convertUTF8ToUTF16WithLatin1Fallback(name, -1));
 }
 

trunk/WebCore/bridge/c/c_utility.h

@@ -50 +50 @@
 void convertValueToNPVariant(ExecState*, JSValue, NPVariant* result);
 JSValue convertNPVariantToValue(ExecState*, const NPVariant*, RootObject*);
-Identifier identifierFromNPIdentifier(const NPUTF8* name);
+Identifier identifierFromNPIdentifier(ExecState*, const NPUTF8* name);
 
 } }