Changeset 80188 in webkit

Timestamp:

Mar 2, 2011 5:17:45 PM (13 years ago)

Author:

timothy@apple.com

Message:

Make the runJavaScriptInMainFrame callback send a WKSerializedScriptValueRef.

Source/WebCore: Export SerializedScriptValue::create(JSC::ExecState* exec, JSC::JSValue value).

Reviewed by Darin Adler.

• WebCore.exp.in: Added ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueE.

Source/WebKit2: Make the runJavaScriptInMainFrame callback send a WKSerializedScriptValueRef.

​https://webkit.org/b/55623

Reviewed by Darin Adler.

• UIProcess/API/C/WKPage.cpp:

(WKPageRunJavaScriptInMainFrame): Use ScriptValueCallback.
(callRunJavaScriptBlockAndRelease): Use WKSerializedScriptValueRef.

• UIProcess/API/C/WKPage.h: Use WKSerializedScriptValueRef.
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::close): Call invalidateCallbackMap for m_scriptValueCallbacks.
(WebKit::WebPageProxy::runJavaScriptInMainFrame): Take a ScriptValueCallback.
(WebKit::WebPageProxy::scriptValueCallback): Added. Create a WebSerializedScriptValue
from the DataReference before calling the callback.
(WebKit::WebPageProxy::processDidCrash): Call invalidateCallbackMap for m_scriptValueCallbacks.

• UIProcess/WebPageProxy.h: Added ScriptValueCallback and m_scriptValueCallbacks.
• UIProcess/WebPageProxy.messages.in: Added ScriptValueCallback.
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::runJavaScriptInMainFrame): Create a DataReference from a WebCore::SerializedScriptValue.
And use ScriptValueCallback to send the message back.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPage.h (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (4 diffs)
• WebKit2/UIProcess/WebPageProxy.h (modified) (4 diffs)
• WebKit2/UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-02  Timothy Hatcher  <timothy@apple.com>
+
+        Export SerializedScriptValue::create(JSC::ExecState* exec, JSC::JSValue value).
+
+        Reviewed by Darin Adler.
+
+        * WebCore.exp.in: Added __ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueE.
+
 2011-03-02  Daniel Cheng  <dcheng@chromium.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -529 +529 @@
 __ZN7WebCore21SerializedScriptValue11deserializeEPK15OpaqueJSContextPPK13OpaqueJSValue
 __ZN7WebCore21SerializedScriptValue6createEPK15OpaqueJSContextPK13OpaqueJSValuePS6_
+__ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueE
 __ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLm0EEE
 __ZN7WebCore21SerializedScriptValueD1Ev

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-02  Timothy Hatcher  <timothy@apple.com>
+
+        Make the runJavaScriptInMainFrame callback send a WKSerializedScriptValueRef.
+
+        https://webkit.org/b/55623
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageRunJavaScriptInMainFrame): Use ScriptValueCallback.
+        (callRunJavaScriptBlockAndRelease): Use WKSerializedScriptValueRef.
+        * UIProcess/API/C/WKPage.h: Use WKSerializedScriptValueRef.
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::close): Call invalidateCallbackMap for m_scriptValueCallbacks.
+        (WebKit::WebPageProxy::runJavaScriptInMainFrame): Take a ScriptValueCallback.
+        (WebKit::WebPageProxy::scriptValueCallback): Added. Create a WebSerializedScriptValue
+        from the DataReference before calling the callback.
+        (WebKit::WebPageProxy::processDidCrash): Call invalidateCallbackMap for m_scriptValueCallbacks.
+        * UIProcess/WebPageProxy.h: Added ScriptValueCallback and m_scriptValueCallbacks.
+        * UIProcess/WebPageProxy.messages.in: Added ScriptValueCallback.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::runJavaScriptInMainFrame): Create a DataReference from a WebCore::SerializedScriptValue.
+        And use ScriptValueCallback to send the message back.
+
 2011-03-02  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -398 +398 @@
 void WKPageRunJavaScriptInMainFrame(WKPageRef pageRef, WKStringRef scriptRef, void* context, WKPageRunJavaScriptFunction callback)
 {
-    toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), StringCallback::create(context, callback));
+    toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), ScriptValueCallback::create(context, callback));
 }
 
 #ifdef __BLOCKS__
-static void callRunJavaScriptBlockAndRelease(WKStringRef resultValue, WKErrorRef error, void* context)
+static void callRunJavaScriptBlockAndRelease(WKSerializedScriptValueRef resultValue, WKErrorRef error, void* context)
 {
     WKPageRunJavaScriptBlock block = (WKPageRunJavaScriptBlock)context;

trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

@@ -340 +340 @@
 WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClient* client);
 
-typedef void (*WKPageRunJavaScriptFunction)(WKStringRef, WKErrorRef, void*);
+typedef void (*WKPageRunJavaScriptFunction)(WKSerializedScriptValueRef, WKErrorRef, void*);
 WK_EXPORT void WKPageRunJavaScriptInMainFrame(WKPageRef page, WKStringRef script, void* context, WKPageRunJavaScriptFunction function);
 #ifdef __BLOCKS__
-typedef void (^WKPageRunJavaScriptBlock)(WKStringRef, WKErrorRef);
+typedef void (^WKPageRunJavaScriptBlock)(WKSerializedScriptValueRef, WKErrorRef);
 WK_EXPORT void WKPageRunJavaScriptInMainFrame_b(WKPageRef page, WKStringRef script, WKPageRunJavaScriptBlock block);
 #endif

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -312 +312 @@
     invalidateCallbackMap(m_dataCallbacks);
     invalidateCallbackMap(m_stringCallbacks);
+    invalidateCallbackMap(m_scriptValueCallbacks);
     invalidateCallbackMap(m_computedPagesCallbacks);
 
@@ -1113 +1114 @@
     process()->send(Messages::WebPage::CountStringMatches(string, options, maxMatchCount), m_pageID);
 }
-    
-void WebPageProxy::runJavaScriptInMainFrame(const String& script, PassRefPtr<StringCallback> prpCallback)
-{
-    RefPtr<StringCallback> callback = prpCallback;
+
+void WebPageProxy::runJavaScriptInMainFrame(const String& script, PassRefPtr<ScriptValueCallback> prpCallback)
+{
+    RefPtr<ScriptValueCallback> callback = prpCallback;
     uint64_t callbackID = callback->callbackID();
-    m_stringCallbacks.set(callbackID, callback.get());
+    m_scriptValueCallbacks.set(callbackID, callback.get());
     process()->send(Messages::WebPage::RunJavaScriptInMainFrame(script, callbackID), m_pageID);
 }
@@ -2443 +2444 @@
 }
 
+void WebPageProxy::scriptValueCallback(const CoreIPC::DataReference& dataReference, uint64_t callbackID)
+{
+    RefPtr<ScriptValueCallback> callback = m_scriptValueCallbacks.take(callbackID);
+    if (!callback) {
+        // FIXME: Log error or assert.
+        return;
+    }
+
+    Vector<uint8_t> data;
+    data.reserveInitialCapacity(dataReference.size());
+    data.append(dataReference.data(), dataReference.size());
+
+    callback->performCallbackWithReturnValue(WebSerializedScriptValue::adopt(data).get());
+}
+
 void WebPageProxy::computedPagesCallback(const Vector<WebCore::IntRect>& pageRects, double totalScaleFactorForPrinting, uint64_t callbackID)
 {
@@ -2548 +2564 @@
     invalidateCallbackMap(m_dataCallbacks);
     invalidateCallbackMap(m_stringCallbacks);
+    invalidateCallbackMap(m_scriptValueCallbacks);
     invalidateCallbackMap(m_computedPagesCallbacks);
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -114 +114 @@
 
 typedef GenericCallback<WKStringRef, StringImpl*> StringCallback;
+typedef GenericCallback<WKSerializedScriptValueRef, WebSerializedScriptValue*> ScriptValueCallback;
 
 class WebPageProxy : public APIObject, public WebPopupMenuProxy::Client {
@@ -304 +305 @@
     void getSourceForFrame(WebFrameProxy*, PassRefPtr<StringCallback>);
     void getWebArchiveOfFrame(WebFrameProxy*, PassRefPtr<DataCallback>);
-    void runJavaScriptInMainFrame(const String&, PassRefPtr<StringCallback>);
+    void runJavaScriptInMainFrame(const String&, PassRefPtr<ScriptValueCallback>);
     void forceRepaint(PassRefPtr<VoidCallback>);
 
@@ -575 +576 @@
     void dataCallback(const CoreIPC::DataReference&, uint64_t);
     void stringCallback(const String&, uint64_t);
+    void scriptValueCallback(const CoreIPC::DataReference&, uint64_t);
     void computedPagesCallback(const Vector<WebCore::IntRect>&, double totalScaleFactorForPrinting, uint64_t);
 
@@ -624 +626 @@
     HashMap<uint64_t, RefPtr<DataCallback> > m_dataCallbacks;
     HashMap<uint64_t, RefPtr<StringCallback> > m_stringCallbacks;
+    HashMap<uint64_t, RefPtr<ScriptValueCallback> > m_scriptValueCallbacks;
     HashMap<uint64_t, RefPtr<ComputedPagesCallback> > m_computedPagesCallbacks;
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -120 +120 @@
     DataCallback(CoreIPC::DataReference resultData, uint64_t callbackID)
     StringCallback(WTF::String resultString, uint64_t callbackID)
+    ScriptValueCallback(CoreIPC::DataReference resultData, uint64_t callbackID)
     ComputedPagesCallback(Vector<WebCore::IntRect> pageRects, double totalScaleFactorForPrinting, uint64_t callbackID)
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -92 +92 @@
 #include <WebCore/ReplaceSelectionCommand.h>
 #include <WebCore/ResourceRequest.h>
+#include <WebCore/SerializedScriptValue.h>
 #include <WebCore/Settings.h>
 #include <WebCore/SharedBuffer.h>
@@ -1195 +1196 @@
     // disappear during script execution.
 
+    CoreIPC::DataReference dataReference;
+
     JSLock lock(SilenceAssertionsOnly);
-    JSValue resultValue = m_mainFrame->coreFrame()->script()->executeScript(script, true).jsValue();
-    String resultString;
-    if (resultValue)
-        resultString = ustringToString(resultValue.toString(m_mainFrame->coreFrame()->script()->globalObject(mainThreadNormalWorld())->globalExec()));
-
-    send(Messages::WebPageProxy::StringCallback(resultString, callbackID));
+    if (JSValue resultValue = m_mainFrame->coreFrame()->script()->executeScript(script, true).jsValue()) {
+        if (RefPtr<SerializedScriptValue> serializedResultValue = SerializedScriptValue::create(m_mainFrame->coreFrame()->script()->globalObject(mainThreadNormalWorld())->globalExec(), resultValue))
+           dataReference = CoreIPC::DataReference(serializedResultValue->data().data(), serializedResultValue->data().size());
+    }
+
+    send(Messages::WebPageProxy::ScriptValueCallback(dataReference, callbackID));
 }