Changeset 37428 in webkit for trunk/JavaScriptCore/API

Timestamp:

Oct 8, 2008, 10:50:42 AM (17 years ago)

Author:

[email protected]

Message:

Roll out r37427 because it causes an infinite recursion loading about:blank.

​https://bugs.webkit.org/show_bug.cgi?id=21476

Location:

trunk/JavaScriptCore/API

Files:

• JSObjectRef.cpp (modified) (6 diffs)
• OpaqueJSString.cpp (modified) (1 diff)
• OpaqueJSString.h (modified) (2 diffs)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -93 +93 @@
     JSLock lock(exec);
 
-    Identifier nameID = name ? name->identifier(&exec->globalData()) : Identifier(exec, "anonymous");
+    Identifier nameID = name ? name->identifier(exec) : Identifier(exec, "anonymous");
     
     return toRef(new (exec) JSCallbackFunction(exec, callAsFunction, nameID));
@@ -119 +119 @@
     JSLock lock(exec);
 
-    Identifier nameID = name ? name->identifier(&exec->globalData()) : Identifier(exec, "anonymous");
+    Identifier nameID = name ? name->identifier(exec) : Identifier(exec, "anonymous");
     
     ArgList args;
@@ -247 +247 @@
     JSObject* jsObject = toJS(object);
     
-    return jsObject->hasProperty(exec, propertyName->identifier(&exec->globalData()));
+    return jsObject->hasProperty(exec, propertyName->identifier(exec));
 }
 
@@ -258 +258 @@
     JSObject* jsObject = toJS(object);
 
-    JSValue* jsValue = jsObject->get(exec, propertyName->identifier(&exec->globalData()));
+    JSValue* jsValue = jsObject->get(exec, propertyName->identifier(exec));
     if (exec->hadException()) {
         if (exception)
@@ -274 +274 @@
 
     JSObject* jsObject = toJS(object);
-    Identifier name(propertyName->identifier(&exec->globalData()));
+    Identifier name(propertyName->identifier(exec));
     JSValue* jsValue = toJS(value);
 
@@ -334 +334 @@
     JSObject* jsObject = toJS(object);
 
-    bool result = jsObject->deleteProperty(exec, propertyName->identifier(&exec->globalData()));
+    bool result = jsObject->deleteProperty(exec,  propertyName->identifier(exec));
     if (exec->hadException()) {
         if (exception)

trunk/JavaScriptCore/API/OpaqueJSString.cpp

@@ -47 +47 @@
 }
 
+Identifier OpaqueJSString::identifier(ExecState* exec) const
+{
+    return identifier(&exec->globalData());
+}
+
 Identifier OpaqueJSString::identifier(JSGlobalData* globalData) const
 {

trunk/JavaScriptCore/API/OpaqueJSString.h

@@ -30 +30 @@
 
 namespace JSC {
+    class ExecState;
     class Identifier;
     class JSGlobalData;
-}
+};
 
 struct OpaqueJSString : public ThreadSafeShared<OpaqueJSString> {
@@ -52 +53 @@
 
     JSC::UString ustring() const;
+
+    JSC::Identifier identifier(JSC::ExecState*) const;
     JSC::Identifier identifier(JSC::JSGlobalData*) const;