Changeset 51329 in webkit for trunk/JavaScriptCore/API

Timestamp:

Nov 23, 2009, 4:54:27 PM (16 years ago)

Author:

[email protected]

Message:

Part 1/3 of <rdar://problem/7377477> REGRESSION: Many web pages fail to render after interesting script runs in isolated world

Reviewed by Geoff Garen.

Some clients of the JavaScriptCore API expect to be able to make callbacks over the JSC API,
and for this to automagically cause execution to take place in the world associated with the
global object associated with the ExecState (JSContextRef) passed. However this is not how
things work - the world must be explicitly set within WebCore.

Making this work just for API calls to evaluate & call will be a far from perfect solution,
since direct (non-API) use of JSC still relies on WebCore setting the current world correctly.
A better solution would be to make this all work automagically all throughout WebCore, but this
will require more refactoring.

Since the API is in JSC but worlds only exist in WebCore, add callbacks on the JSGlobalData::ClientData
to allow it to update the current world on entry/exit via the JSC API. This is temporary duck
tape, and should be removed once the current world no longer needs to be explicitly tracked.

• API/JSBase.cpp:

(JSEvaluateScript):

• API/JSObjectRef.cpp:

(JSObjectCallAsFunction):

• JavaScriptCore.exp:
• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::ClientData::beginningExecution):
(JSC::JSGlobalData::ClientData::completedExecution):

• runtime/JSGlobalData.h:

Location:

trunk/JavaScriptCore/API

Files:

• JSBase.cpp (modified) (2 diffs)
• JSObjectRef.cpp (modified) (2 diffs)

trunk/JavaScriptCore/API/JSBase.cpp

@@ -47 +47 @@
     JSLock lock(exec);
 
+    exec->globalData().clientData->willExecute(exec);
+
     JSObject* jsThisObject = toJS(thisObject);
 
@@ -54 +56 @@
     Completion completion = evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), source, jsThisObject);
 
+    JSValueRef result = 0;
     if (completion.complType() == Throw) {
         if (exception)
             *exception = toRef(exec, completion.value());
-        return 0;
-    }
+    } else if (completion.value())
+        result = toRef(exec, completion.value());
+    else // happens, for example, when the only statement is an empty (';') statement
+        result = toRef(exec, jsUndefined());
 
-    if (completion.value())
-        return toRef(exec, completion.value());
-    
-    // happens, for example, when the only statement is an empty (';') statement
-    return toRef(exec, jsUndefined());
+    exec->globalData().clientData->didExecute(exec);
+    return result;
 }
 

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -393 +393 @@
     JSLock lock(exec);
 
+    exec->globalData().clientData->willExecute(exec);
+
     JSObject* jsObject = toJS(object);
     JSObject* jsThisObject = toJS(thisObject);
@@ -403 +405 @@
         argList.append(toJS(exec, arguments[i]));
 
+    JSValueRef result = 0;
+
     CallData callData;
     CallType callType = jsObject->getCallData(callData);
-    if (callType == CallTypeNone)
-        return 0;
-
-    JSValueRef result = toRef(exec, call(exec, jsObject, callType, callData, jsThisObject, argList));
-    if (exec->hadException()) {
-        if (exception)
-            *exception = toRef(exec, exec->exception());
-        exec->clearException();
-        result = 0;
-    }
+    if (callType != CallTypeNone) {
+        result = toRef(exec, call(exec, jsObject, callType, callData, jsThisObject, argList));
+        if (exec->hadException()) {
+            if (exception)
+                *exception = toRef(exec, exec->exception());
+            exec->clearException();
+            result = 0;
+        }
+    }
+
+    exec->globalData().clientData->didExecute(exec);
     return result;
 }