<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185554] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185554">185554</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-06-15 09:57:01 -0700 (Mon, 15 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>-[WKWebView evaluateJavaScript] provides a misleading error when the return cannot be serialized
https://bugs.webkit.org/show_bug.cgi?id=145900
Reviewed by Sam Weinig.
Source/WebCore:
* English.lproj/Localizable.strings:
Source/WebKit2:
We used to conflate to cases: (1) when there was a JavaScript exception, and
(2) when the result could not be serialized for IPC. Turns out that it was quite
misleading!
* UIProcess/API/C/WKPage.cpp:
(WKPageRunJavaScriptInMainFrame):
* UIProcess/API/Cocoa/WKError.h:
* UIProcess/API/Cocoa/WKError.mm:
(localizedDescriptionForErrorCode):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView evaluateJavaScript:completionHandler:]):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::runJavaScriptInMainFrame):
(WebKit::WebPageProxy::scriptValueCallback):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::runJavaScriptInMainFrame):
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_run_javascript):
(resourcesStreamReadCallback):
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewEvaluateJavaScript.mm:
(TEST): Added tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKErrorh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKErrormm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaWKWebViewEvaluateJavaScriptmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewEvaluateJavaScript.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebCore/ChangeLog 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-06-12 Alexey Proskuryakov <ap@apple.com>
+
+ -[WKWebView evaluateJavaScript] provides a misleading error when the return cannot be serialized
+ https://bugs.webkit.org/show_bug.cgi?id=145900
+
+ Reviewed by Sam Weinig.
+
+ * English.lproj/Localizable.strings:
+
</ins><span class="cx"> 2015-06-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Custom URI schemes don't work for requests containing a fragment identifier
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -91,6 +91,9 @@
</span><span class="cx"> /* WKErrorJavaScriptExceptionOccurred description */
</span><span class="cx"> "A JavaScript exception occurred" = "A JavaScript exception occurred";
</span><span class="cx">
</span><ins>+/* WKErrorJavaScriptResultTypeIsUnsupported */
+"JavaScript execution returned a result of an unsupported type" = "JavaScript execution returned a result of an unsupported type";
+
</ins><span class="cx"> /* action menu item */
</span><span class="cx"> "Add to Photos (action menu item)" = "Add to Photos";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-06-12 Alexey Proskuryakov <ap@apple.com>
+
+ -[WKWebView evaluateJavaScript] provides a misleading error when the return cannot be serialized
+ https://bugs.webkit.org/show_bug.cgi?id=145900
+
+ Reviewed by Sam Weinig.
+
+ We used to conflate to cases: (1) when there was a JavaScript exception, and
+ (2) when the result could not be serialized for IPC. Turns out that it was quite
+ misleading!
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageRunJavaScriptInMainFrame):
+ * UIProcess/API/Cocoa/WKError.h:
+ * UIProcess/API/Cocoa/WKError.mm:
+ (localizedDescriptionForErrorCode):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView evaluateJavaScript:completionHandler:]):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::runJavaScriptInMainFrame):
+ (WebKit::WebPageProxy::scriptValueCallback):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::runJavaScriptInMainFrame):
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_run_javascript):
+ (resourcesStreamReadCallback):
+
</ins><span class="cx"> 2015-06-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Custom URI schemes don't work for requests containing a fragment identifier
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -1944,7 +1944,9 @@
</span><span class="cx">
</span><span class="cx"> void WKPageRunJavaScriptInMainFrame(WKPageRef pageRef, WKStringRef scriptRef, void* context, WKPageRunJavaScriptFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), toGenericCallbackFunction(context, callback));
</del><ins>+ toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), [context, callback](API::SerializedScriptValue* returnValue, bool, CallbackBase::Error error) {
+ callback(toAPI(returnValue), (error != CallbackBase::Error::None) ? toAPI(API::Error::create().ptr()) : 0, context);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifdef __BLOCKS__
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.h (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.h 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.h 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -36,16 +36,18 @@
</span><span class="cx">
</span><span class="cx"> /*! @enum WKErrorCode
</span><span class="cx"> @abstract Constants used by NSError to indicate errors in the WebKit domain.
</span><del>- @constant WKErrorUnknown Indicates that an unknown error occurred.
- @constant WKErrorWebContentProcessTerminated Indicates that the Web Content process was terminated.
- @constant WKErrorWebViewInvalidated Indicates that the WKWebView was invalidated.
- @constant WKErrorJavaScriptExceptionOccurred Indicates that a JavaScript exception occurred.
</del><ins>+ @constant WKErrorUnknown Indicates that an unknown error occurred.
+ @constant WKErrorWebContentProcessTerminated Indicates that the Web Content process was terminated.
+ @constant WKErrorWebViewInvalidated Indicates that the WKWebView was invalidated.
+ @constant WKErrorJavaScriptExceptionOccurred Indicates that a JavaScript exception occurred.
+ @constant WKErrorJavaScriptResultTypeIsUnsupported Indicates that the result of JavaScript execution could not be returned.
</ins><span class="cx"> */
</span><span class="cx"> typedef NS_ENUM(NSInteger, WKErrorCode) {
</span><span class="cx"> WKErrorUnknown = 1,
</span><span class="cx"> WKErrorWebContentProcessTerminated,
</span><span class="cx"> WKErrorWebViewInvalidated,
</span><span class="cx"> WKErrorJavaScriptExceptionOccurred,
</span><ins>+ WKErrorJavaScriptResultTypeIsUnsupported WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA),
</ins><span class="cx"> } WK_ENUM_AVAILABLE(10_10, 8_0);
</span><span class="cx">
</span><span class="cx"> WK_ASSUME_NONNULL_END
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKErrormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.mm 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx">
</span><span class="cx"> case WKErrorJavaScriptExceptionOccurred:
</span><span class="cx"> return WEB_UI_STRING("A JavaScript exception occurred", "WKErrorJavaScriptExceptionOccurred description");
</span><ins>+
+ case WKErrorJavaScriptResultTypeIsUnsupported:
+ return WEB_UI_STRING("JavaScript execution returned a result of an unsupported type", "WKErrorJavaScriptResultTypeIsUnsupported description");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto handler = adoptNS([completionHandler copy]);
</span><span class="cx">
</span><del>- _page->runJavaScriptInMainFrame(javaScriptString, [handler](API::SerializedScriptValue* serializedScriptValue, WebKit::ScriptValueCallback::Error errorCode) {
</del><ins>+ _page->runJavaScriptInMainFrame(javaScriptString, [handler](API::SerializedScriptValue* serializedScriptValue, bool hadException, WebKit::ScriptValueCallback::Error errorCode) {
</ins><span class="cx"> if (!handler)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -613,11 +613,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto rawHandler = (void (^)(id, NSError *))handler.get();
</span><del>- if (!serializedScriptValue) {
</del><ins>+ if (hadException) {
+ ASSERT(!serializedScriptValue);
</ins><span class="cx"> rawHandler(nil, createNSError(WKErrorJavaScriptExceptionOccurred).get());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!serializedScriptValue) {
+ rawHandler(nil, createNSError(WKErrorJavaScriptResultTypeIsUnsupported).get());
+ return;
+ }
+
</ins><span class="cx"> auto context = adoptNS([[JSContext alloc] init]);
</span><span class="cx"> JSValueRef valueRef = serializedScriptValue->deserialize([context JSGlobalContextRef], 0);
</span><span class="cx"> JSValue *value = [JSValue valueWithJSValueRef:valueRef inContext:context.get()];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -3008,7 +3008,7 @@
</span><span class="cx"> g_return_if_fail(script);
</span><span class="cx">
</span><span class="cx"> GTask* task = g_task_new(webView, cancellable, callback, userData);
</span><del>- getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), [task](API::SerializedScriptValue* serializedScriptValue, WebKit::CallbackBase::Error) {
</del><ins>+ getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), [task](API::SerializedScriptValue* serializedScriptValue, bool, WebKit::CallbackBase::Error) {
</ins><span class="cx"> webkitWebViewRunJavaScriptCallback(serializedScriptValue, adoptGRef(task).get());
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -3099,7 +3099,7 @@
</span><span class="cx"> WebKitWebView* webView = WEBKIT_WEB_VIEW(g_task_get_source_object(task.get()));
</span><span class="cx"> gpointer outputStreamData = g_memory_output_stream_get_data(G_MEMORY_OUTPUT_STREAM(object));
</span><span class="cx"> getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(reinterpret_cast<const gchar*>(outputStreamData)),
</span><del>- [task](API::SerializedScriptValue* serializedScriptValue, WebKit::CallbackBase::Error) {
</del><ins>+ [task](API::SerializedScriptValue* serializedScriptValue, bool, WebKit::CallbackBase::Error) {
</ins><span class="cx"> webkitWebViewRunJavaScriptCallback(serializedScriptValue, task.get());
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -2574,10 +2574,10 @@
</span><span class="cx"> m_process->send(Messages::WebPage::CountStringMatches(string, options, maxMatchCount), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::runJavaScriptInMainFrame(const String& script, std::function<void (API::SerializedScriptValue*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebPageProxy::runJavaScriptInMainFrame(const String& script, std::function<void (API::SerializedScriptValue*, bool hadException, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValid()) {
</span><del>- callbackFunction(nullptr, CallbackBase::Error::Unknown);
</del><ins>+ callbackFunction(nullptr, false, CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4644,7 +4644,7 @@
</span><span class="cx"> callback->performCallbackWithReturnValue(resultString.impl());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::scriptValueCallback(const IPC::DataReference& dataReference, uint64_t callbackID)
</del><ins>+void WebPageProxy::scriptValueCallback(const IPC::DataReference& dataReference, bool hadException, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> auto callback = m_callbacks.take<ScriptValueCallback>(callbackID);
</span><span class="cx"> if (!callback) {
</span><span class="lines">@@ -4656,7 +4656,7 @@
</span><span class="cx"> data.reserveInitialCapacity(dataReference.size());
</span><span class="cx"> data.append(dataReference.data(), dataReference.size());
</span><span class="cx">
</span><del>- callback->performCallbackWithReturnValue(data.size() ? API::SerializedScriptValue::adopt(data).get() : 0);
</del><ins>+ callback->performCallbackWithReturnValue(data.size() ? API::SerializedScriptValue::adopt(data).get() : 0, hadException);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::computedPagesCallback(const Vector<IntRect>& pageRects, double totalScaleFactorForPrinting, uint64_t callbackID)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> typedef GenericCallback<uint64_t> UnsignedCallback;
</span><span class="cx"> typedef GenericCallback<EditingRange> EditingRangeCallback;
</span><span class="cx"> typedef GenericCallback<const String&> StringCallback;
</span><del>-typedef GenericCallback<API::SerializedScriptValue*> ScriptValueCallback;
</del><ins>+typedef GenericCallback<API::SerializedScriptValue*, bool> ScriptValueCallback;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> typedef GenericCallback<API::Error*> PrintFinishedCallback;
</span><span class="lines">@@ -763,7 +763,7 @@
</span><span class="cx"> void getSelectionAsWebArchiveData(std::function<void (API::Data*, CallbackBase::Error)>);
</span><span class="cx"> void getSourceForFrame(WebFrameProxy*, std::function<void (const String&, CallbackBase::Error)>);
</span><span class="cx"> void getWebArchiveOfFrame(WebFrameProxy*, std::function<void (API::Data*, CallbackBase::Error)>);
</span><del>- void runJavaScriptInMainFrame(const String&, std::function<void (API::SerializedScriptValue*, CallbackBase::Error)> callbackFunction);
</del><ins>+ void runJavaScriptInMainFrame(const String&, std::function<void (API::SerializedScriptValue*, bool hadException, CallbackBase::Error)> callbackFunction);
</ins><span class="cx"> void forceRepaint(PassRefPtr<VoidCallback>);
</span><span class="cx">
</span><span class="cx"> float headerHeight(WebFrameProxy*);
</span><span class="lines">@@ -1322,7 +1322,7 @@
</span><span class="cx"> void dataCallback(const IPC::DataReference&, uint64_t);
</span><span class="cx"> void imageCallback(const ShareableBitmap::Handle&, uint64_t);
</span><span class="cx"> void stringCallback(const String&, uint64_t);
</span><del>- void scriptValueCallback(const IPC::DataReference&, uint64_t);
</del><ins>+ void scriptValueCallback(const IPC::DataReference&, bool hadException, uint64_t);
</ins><span class="cx"> void computedPagesCallback(const Vector<WebCore::IntRect>&, double totalScaleFactorForPrinting, uint64_t);
</span><span class="cx"> void validateCommandCallback(const String&, bool, int, uint64_t);
</span><span class="cx"> void unsignedCallback(uint64_t, uint64_t);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> DataCallback(IPC::DataReference resultData, uint64_t callbackID)
</span><span class="cx"> ImageCallback(WebKit::ShareableBitmap::Handle bitmapHandle, uint64_t callbackID)
</span><span class="cx"> StringCallback(String resultString, uint64_t callbackID)
</span><del>- ScriptValueCallback(IPC::DataReference resultData, uint64_t callbackID)
</del><ins>+ ScriptValueCallback(IPC::DataReference resultData, bool hadException, uint64_t callbackID)
</ins><span class="cx"> ComputedPagesCallback(Vector<WebCore::IntRect> pageRects, double totalScaleFactorForPrinting, uint64_t callbackID)
</span><span class="cx"> ValidateCommandCallback(String command, bool isEnabled, int32_t state, uint64_t callbackID)
</span><span class="cx"> EditingRangeCallback(struct WebKit::EditingRange range, uint64_t callbackID)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -2529,7 +2529,9 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<SerializedScriptValue> serializedResultValue;
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><ins>+ bool hadException = true;
</ins><span class="cx"> if (JSValue resultValue = m_mainFrame->coreFrame()->script().executeScript(script, true).jsValue()) {
</span><ins>+ hadException = false;
</ins><span class="cx"> serializedResultValue = SerializedScriptValue::create(m_mainFrame->jsContext(),
</span><span class="cx"> toRef(m_mainFrame->coreFrame()->script().globalObject(mainThreadNormalWorld())->globalExec(), resultValue), nullptr);
</span><span class="cx"> }
</span><span class="lines">@@ -2537,7 +2539,7 @@
</span><span class="cx"> IPC::DataReference dataReference;
</span><span class="cx"> if (serializedResultValue)
</span><span class="cx"> dataReference = serializedResultValue->data();
</span><del>- send(Messages::WebPageProxy::ScriptValueCallback(dataReference, callbackID));
</del><ins>+ send(Messages::WebPageProxy::ScriptValueCallback(dataReference, hadException, callbackID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::getContentsAsString(uint64_t callbackID)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Tools/ChangeLog 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-12 Alexey Proskuryakov <ap@apple.com>
+
+ -[WKWebView evaluateJavaScript] provides a misleading error when the return cannot be serialized
+ https://bugs.webkit.org/show_bug.cgi?id=145900
+
+ Reviewed by Sam Weinig.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewEvaluateJavaScript.mm:
+ (TEST): Added tests.
+
</ins><span class="cx"> 2015-06-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Custom URI schemes don't work for requests containing a fragment identifier
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaWKWebViewEvaluateJavaScriptmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewEvaluateJavaScript.mm (185553 => 185554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewEvaluateJavaScript.mm 2015-06-15 16:36:24 UTC (rev 185553)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewEvaluateJavaScript.mm 2015-06-15 16:57:01 UTC (rev 185554)
</span><span class="lines">@@ -60,4 +60,34 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&isDone);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WKWebView, EvaluateJavaScriptErrorCases)
+{
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+
+ NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
+ [webView loadRequest:request];
+
+ [webView evaluateJavaScript:@"document.body" completionHandler:^(id result, NSError *error) {
+ EXPECT_NULL(result);
+ EXPECT_WK_STREQ(@"WKErrorDomain", [error domain]);
+ EXPECT_EQ(5, [error code]);
+
+ isDone = true;
+ }];
+
+ isDone = false;
+ TestWebKitAPI::Util::run(&isDone);
+
+ [webView evaluateJavaScript:@"document.body.insertBefore(document, document)" completionHandler:^(id result, NSError *error) {
+ EXPECT_NULL(result);
+ EXPECT_WK_STREQ(@"WKErrorDomain", [error domain]);
+ EXPECT_EQ(4, [error code]);
+
+ isDone = true;
+ }];
+
+ isDone = false;
+ TestWebKitAPI::Util::run(&isDone);
+}
+
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>