<!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>[185721] trunk/Source</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/185721">185721</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-18 13:59:12 -0700 (Thu, 18 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove shouldInterruptJavaScript
https://bugs.webkit.org/show_bug.cgi?id=146118
Reviewed by Antti Koivisto.
Source/WebCore:
The WebKit SPI methods for deciding whether JavaScript execution should be interrupted hasn't been used
for many releases. Furthermore, they don't make sense in the multi-process architecture since it's still possible
to interrupt execution (by closing the browser tab or window) from the UI process.
* bindings/js/JSDOMWindowBase.cpp:
(WebCore::JSDOMWindowBase::shouldInterruptScript):
* loader/EmptyClients.h:
* page/Chrome.cpp:
(WebCore::Chrome::shouldInterruptJavaScript): Deleted.
* page/Chrome.h:
* page/ChromeClient.h:
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::shouldInterruptJavaScript): Deleted.
* WebView/WebUIDelegatePrivate.h:
Source/WebKit/win:
* Interfaces/IWebUIDelegatePrivate.idl:
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::shouldInterruptJavaScript): Deleted.
* WebCoreSupport/WebChromeClient.h:
Source/WebKit2:
* UIProcess/API/APIUIClient.h:
(API::UIClient::shouldInterruptJavaScript): Deleted.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient): Deleted.
* UIProcess/API/C/WKPageUIClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::shouldInterruptJavaScript): Deleted.
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::shouldInterruptJavaScript): Deleted.
* WebProcess/WebCoreSupport/WebChromeClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCorepageChromecpp">trunk/Source/WebCore/page/Chrome.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeh">trunk/Source/WebCore/page/Chrome.h</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebUIDelegatePrivateh">trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesIWebUIDelegatePrivateidl">trunk/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClienth">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUIClienth">trunk/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageUIClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h</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="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebCore/ChangeLog 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-06-18 Anders Carlsson <andersca@apple.com>
+
+ Remove shouldInterruptJavaScript
+ https://bugs.webkit.org/show_bug.cgi?id=146118
+
+ Reviewed by Antti Koivisto.
+
+ The WebKit SPI methods for deciding whether JavaScript execution should be interrupted hasn't been used
+ for many releases. Furthermore, they don't make sense in the multi-process architecture since it's still possible
+ to interrupt execution (by closing the browser tab or window) from the UI process.
+
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::shouldInterruptScript):
+ * loader/EmptyClients.h:
+ * page/Chrome.cpp:
+ (WebCore::Chrome::shouldInterruptJavaScript): Deleted.
+ * page/Chrome.h:
+ * page/ChromeClient.h:
+
</ins><span class="cx"> 2015-06-18 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS JIT][ARMv7] The pseudo element early exit trashes r6
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
</span><span class="cx"> ASSERT(thisObject->impl().frame());
</span><span class="cx"> Page* page = thisObject->impl().frame()->page();
</span><del>- return shouldInterruptScriptToPreventInfiniteRecursionWhenClosingPage(page) || page->chrome().shouldInterruptJavaScript();
</del><ins>+ return shouldInterruptScriptToPreventInfiniteRecursionWhenClosingPage(page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSDOMWindowBase::shouldInterruptScriptBeforeTimeout(const JSGlobalObject* object)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -114,7 +114,6 @@
</span><span class="cx"> virtual void runJavaScriptAlert(Frame*, const String&) override { }
</span><span class="cx"> virtual bool runJavaScriptConfirm(Frame*, const String&) override { return false; }
</span><span class="cx"> virtual bool runJavaScriptPrompt(Frame*, const String&, const String&, String&) override { return false; }
</span><del>- virtual bool shouldInterruptJavaScript() override { return false; }
</del><span class="cx">
</span><span class="cx"> virtual bool selectItemWritingDirectionIsNatural() override { return false; }
</span><span class="cx"> virtual bool selectItemAlignmentFollowsMenuWritingDirection() override { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.cpp (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.cpp 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebCore/page/Chrome.cpp 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -347,15 +347,6 @@
</span><span class="cx"> m_client.setStatusbarText(frame->displayStringModifiedByEncoding(status));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Chrome::shouldInterruptJavaScript()
-{
- // Defer loads in case the client method runs a new event loop that would
- // otherwise cause the load to continue while we're in the middle of executing JavaScript.
- PageGroupLoadDeferrer deferrer(m_page, true);
-
- return m_client.shouldInterruptJavaScript();
-}
-
</del><span class="cx"> IntRect Chrome::windowResizerRect() const
</span><span class="cx"> {
</span><span class="cx"> return m_client.windowResizerRect();
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.h (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.h 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebCore/page/Chrome.h 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -145,7 +145,6 @@
</span><span class="cx"> bool runJavaScriptConfirm(Frame*, const String&);
</span><span class="cx"> bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result);
</span><span class="cx"> WEBCORE_EXPORT void setStatusbarText(Frame*, const String&);
</span><del>- bool shouldInterruptJavaScript();
</del><span class="cx">
</span><span class="cx"> IntRect windowResizerRect() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebCore/page/ChromeClient.h 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -146,7 +146,6 @@
</span><span class="cx"> virtual bool runJavaScriptConfirm(Frame*, const String&) = 0;
</span><span class="cx"> virtual bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result) = 0;
</span><span class="cx"> virtual void setStatusbarText(const String&) = 0;
</span><del>- virtual bool shouldInterruptJavaScript() = 0;
</del><span class="cx"> virtual KeyboardUIMode keyboardUIMode() = 0;
</span><span class="cx">
</span><span class="cx"> virtual IntRect windowResizerRect() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-18 Anders Carlsson <andersca@apple.com>
+
+ Remove shouldInterruptJavaScript
+ https://bugs.webkit.org/show_bug.cgi?id=146118
+
+ Reviewed by Antti Koivisto.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::shouldInterruptJavaScript): Deleted.
+ * WebView/WebUIDelegatePrivate.h:
+
</ins><span class="cx"> 2015-06-17 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Log blocked loads to the WebInspector console
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -89,7 +89,6 @@
</span><span class="cx"> virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&) override;
</span><span class="cx"> virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) override;
</span><span class="cx"> virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result) override;
</span><del>- virtual bool shouldInterruptJavaScript() override;
</del><span class="cx">
</span><span class="cx"> virtual WebCore::IntRect windowResizerRect() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -548,11 +548,6 @@
</span><span class="cx"> return !result.isNull();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebChromeClient::shouldInterruptJavaScript()
-{
- return CallUIDelegateReturningBoolean(NO, m_webView, @selector(webViewShouldInterruptJavaScript:));
-}
-
</del><span class="cx"> void WebChromeClient::setStatusbarText(const String& status)
</span><span class="cx"> {
</span><span class="cx"> // We want the temporaries allocated here to be released even before returning to the
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -214,8 +214,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> - (void)webView:(WebView *)sender didDrawRect:(NSRect)rect;
</span><span class="cx"> - (void)webView:(WebView *)sender didScrollDocumentInFrameView:(WebFrameView *)frameView;
</span><del>-// FIXME: If we ever make this method public, it should include a WebFrame parameter.
-- (BOOL)webViewShouldInterruptJavaScript:(WebView *)sender;
</del><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> - (void)webView:(WebView *)sender willPopupMenu:(NSMenu *)menu;
</span><span class="cx"> - (void)webView:(WebView *)sender contextMenuItemSelected:(NSMenuItem *)item forElement:(NSDictionary *)element;
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit/win/ChangeLog 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-18 Anders Carlsson <andersca@apple.com>
+
+ Remove shouldInterruptJavaScript
+ https://bugs.webkit.org/show_bug.cgi?id=146118
+
+ Reviewed by Antti Koivisto.
+
+ * Interfaces/IWebUIDelegatePrivate.idl:
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::shouldInterruptJavaScript): Deleted.
+ * WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2015-06-17 Hyungwook Lee <hyungwook.lee@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [Win]Implement layoutTestController.dispatchPendingLoadRequests.
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebUIDelegatePrivateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> HRESULT unused2();
</span><span class="cx"> HRESULT webViewScrolled([in] IWebView* sender);
</span><span class="cx"> HRESULT webViewAddMessageToConsole([in] IWebView* sender, [in] BSTR message, [in] int lineNumber, [in] BSTR url, [in] BOOL isError);
</span><del>- HRESULT webViewShouldInterruptJavaScript([in] IWebView* sender, [out, retval] BOOL* result);
</del><ins>+ HRESULT unused3();
</ins><span class="cx"> HRESULT webViewReceivedFocus([in] IWebView* sender);
</span><span class="cx"> HRESULT webViewLostFocus([in] IWebView* sender, [in] HWND loseFocusToHWnd);
</span><span class="cx"> HRESULT doDragDrop([in] IWebView* sender, [in] IDataObject* dataObject, [in] IDropSource* dropSource, [in] DWORD okEffect, [out, retval] DWORD* performedEffect);
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> HRESULT webViewPainted([in] IWebView* sender);
</span><span class="cx"> HRESULT exceededDatabaseQuota([in] IWebView* sender, [in] IWebFrame* frame, [in] IWebSecurityOrigin* origin, [in] BSTR databaseIdentifier);
</span><span class="cx"> HRESULT embeddedViewWithArguments([in] IWebView* sender, [in] IWebFrame* frame, [in] IPropertyBag* arguments, [out, retval] IWebEmbeddedView** view);
</span><del>- HRESULT unused3();
</del><ins>+ HRESULT unused4();
</ins><span class="cx"> HRESULT webViewClosing([in] IWebView* sender);
</span><span class="cx"> HRESULT webViewSetCursor([in] IWebView* sender, [in] HCURSOR cursor);
</span><span class="cx"> HRESULT webViewDidInvalidate([in] IWebView* sender);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -431,20 +431,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebChromeClient::shouldInterruptJavaScript()
-{
- COMPtr<IWebUIDelegate> uiDelegate;
- if (SUCCEEDED(m_webView->uiDelegate(&uiDelegate))) {
- COMPtr<IWebUIDelegatePrivate> uiPrivate;
- if (SUCCEEDED(uiDelegate->QueryInterface(IID_IWebUIDelegatePrivate, (void**)&uiPrivate))) {
- BOOL result;
- if (SUCCEEDED(uiPrivate->webViewShouldInterruptJavaScript(m_webView, &result)))
- return !!result;
- }
- }
- return false;
-}
-
</del><span class="cx"> KeyboardUIMode WebChromeClient::keyboardUIMode()
</span><span class="cx"> {
</span><span class="cx"> BOOL enabled = FALSE;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx"> virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&);
</span><span class="cx"> virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result);
</span><span class="cx"> virtual void setStatusbarText(const WTF::String&);
</span><del>- virtual bool shouldInterruptJavaScript();
</del><span class="cx">
</span><span class="cx"> virtual WebCore::KeyboardUIMode keyboardUIMode();
</span><span class="cx"> virtual WebCore::IntRect windowResizerRect() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-18 Anders Carlsson <andersca@apple.com>
+
+ Remove shouldInterruptJavaScript
+ https://bugs.webkit.org/show_bug.cgi?id=146118
+
+ Reviewed by Antti Koivisto.
+
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::shouldInterruptJavaScript): Deleted.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient): Deleted.
+ * UIProcess/API/C/WKPageUIClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::shouldInterruptJavaScript): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::shouldInterruptJavaScript): Deleted.
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2015-06-18 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Use SFSafariViewController for previews
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -141,8 +141,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void saveDataToFileInDownloadsFolder(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, const WTF::String&, API::Data*) { }
</span><span class="cx">
</span><del>- virtual bool shouldInterruptJavaScript(WebKit::WebPageProxy*) { return false; }
-
</del><span class="cx"> virtual void pinnedStateDidChange(WebKit::WebPageProxy&) { }
</span><span class="cx">
</span><span class="cx"> virtual void didBeginTrackingPotentialLongMousePress(WebKit::WebPageProxy*, const WebCore::IntPoint&, const WebKit::WebHitTestResult::Data&, API::Object*) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -1729,14 +1729,6 @@
</span><span class="cx"> m_client.saveDataToFileInDownloadsFolder(toAPI(page), toAPI(suggestedFilename.impl()), toAPI(mimeType.impl()), toURLRef(originatingURLString.impl()), toAPI(data), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool shouldInterruptJavaScript(WebPageProxy* page) override
- {
- if (!m_client.shouldInterruptJavaScript)
- return false;
-
- return m_client.shouldInterruptJavaScript(toAPI(page), m_client.base.clientInfo);
- }
-
</del><span class="cx"> virtual void pinnedStateDidChange(WebPageProxy& page) override
</span><span class="cx"> {
</span><span class="cx"> if (!m_client.pinnedStateDidChange)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -80,7 +80,6 @@
</span><span class="cx"> typedef void (*WKPageDrawFooterCallback)(WKPageRef page, WKFrameRef frame, WKRect rect, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPagePrintFrameCallback)(WKPageRef page, WKFrameRef frame, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPageSaveDataToFileInDownloadsFolderCallback)(WKPageRef page, WKStringRef suggestedFilename, WKStringRef mimeType, WKURLRef originatingURL, WKDataRef data, const void* clientInfo);
</span><del>-typedef bool (*WKPageShouldInterruptJavaScriptCallback)(WKPageRef page, const void *clientInfo);
</del><span class="cx"> typedef void (*WKPageDecidePolicyForNotificationPermissionRequestCallback)(WKPageRef page, WKSecurityOriginRef origin, WKNotificationPermissionRequestRef permissionRequest, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageShowColorPickerCallback)(WKPageRef page, WKStringRef initialColor, WKColorPickerResultListenerRef listener, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPageHideColorPickerCallback)(WKPageRef page, const void* clientInfo);
</span><span class="lines">@@ -146,7 +145,7 @@
</span><span class="cx"> WKPageUIClientCallback runModal;
</span><span class="cx"> void* unused1; // Used to be didCompleteRubberBandForMainFrame
</span><span class="cx"> WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
</span><del>- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
</del><ins>+ void* shouldInterruptJavaScript_unavailable;
</ins><span class="cx"> } WKPageUIClientV0;
</span><span class="cx">
</span><span class="cx"> typedef struct WKPageUIClientV1 {
</span><span class="lines">@@ -191,7 +190,7 @@
</span><span class="cx"> WKPageUIClientCallback runModal;
</span><span class="cx"> void* unused1; // Used to be didCompleteRubberBandForMainFrame
</span><span class="cx"> WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
</span><del>- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
</del><ins>+ void* shouldInterruptJavaScript_unavailable;
</ins><span class="cx">
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKPageCreateNewPageCallback createNewPage;
</span><span class="lines">@@ -242,7 +241,7 @@
</span><span class="cx"> WKPageUIClientCallback runModal;
</span><span class="cx"> void* unused1; // Used to be didCompleteRubberBandForMainFrame
</span><span class="cx"> WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
</span><del>- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
</del><ins>+ void* shouldInterruptJavaScript_unavailable;
</ins><span class="cx">
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKPageCreateNewPageCallback createNewPage;
</span><span class="lines">@@ -298,7 +297,7 @@
</span><span class="cx"> WKPageUIClientCallback runModal;
</span><span class="cx"> void* unused1; // Used to be didCompleteRubberBandForMainFrame
</span><span class="cx"> WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
</span><del>- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
</del><ins>+ void* shouldInterruptJavaScript_unavailable;
</ins><span class="cx">
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKPageCreateNewPageCallback createNewPage;
</span><span class="lines">@@ -357,7 +356,7 @@
</span><span class="cx"> WKPageUIClientCallback runModal;
</span><span class="cx"> void* unused1; // Used to be didCompleteRubberBandForMainFrame
</span><span class="cx"> WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
</span><del>- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
</del><ins>+ void* shouldInterruptJavaScript_unavailable;
</ins><span class="cx">
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKPageCreateNewPageCallback createNewPage;
</span><span class="lines">@@ -422,7 +421,7 @@
</span><span class="cx"> WKPageUIClientCallback runModal;
</span><span class="cx"> void* unused1; // Used to be didCompleteRubberBandForMainFrame
</span><span class="cx"> WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
</span><del>- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
</del><ins>+ void* shouldInterruptJavaScript_unavailable;
</ins><span class="cx">
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKPageCreateNewPageCallback createNewPage;
</span><span class="lines">@@ -493,7 +492,7 @@
</span><span class="cx"> WKPageUIClientCallback runModal;
</span><span class="cx"> void* unused1; // Used to be didCompleteRubberBandForMainFrame
</span><span class="cx"> WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
</span><del>- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
</del><ins>+ void* shouldInterruptJavaScript_unavailable;
</ins><span class="cx">
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKPageCreateNewPageCallback createNewPage;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -3497,14 +3497,6 @@
</span><span class="cx"> m_uiClient->runJavaScriptPrompt(this, message, defaultValue, frame, [reply](const String& result) { reply->send(result); });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::shouldInterruptJavaScript(bool& result)
-{
- // Since shouldInterruptJavaScript() can spin a nested run loop we need to turn off the responsiveness timer.
- m_process->responsivenessTimer()->stop();
-
- result = m_uiClient->shouldInterruptJavaScript(this);
-}
-
</del><span class="cx"> void WebPageProxy::setStatusText(const String& text)
</span><span class="cx"> {
</span><span class="cx"> m_uiClient->setStatusText(this, text);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -1141,7 +1141,6 @@
</span><span class="cx"> void runJavaScriptAlert(uint64_t frameID, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>);
</span><span class="cx"> void runJavaScriptConfirm(uint64_t frameID, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>);
</span><span class="cx"> void runJavaScriptPrompt(uint64_t frameID, const String&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply>);
</span><del>- void shouldInterruptJavaScript(bool& result);
</del><span class="cx"> void setStatusText(const String&);
</span><span class="cx"> void mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t modifiers, const UserData&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> RunJavaScriptAlert(uint64_t frameID, String message) -> () Delayed
</span><span class="cx"> RunJavaScriptConfirm(uint64_t frameID, String message) -> (bool result) Delayed
</span><span class="cx"> RunJavaScriptPrompt(uint64_t frameID, String message, String defaultValue) -> (String result) Delayed
</span><del>- ShouldInterruptJavaScript() -> (bool shouldInterupt)
</del><span class="cx"> MouseDidMoveOverElement(WebKit::WebHitTestResult::Data hitTestResultData, uint32_t modifiers, WebKit::UserData userData)
</span><span class="cx">
</span><span class="cx"> DidBeginTrackingPotentialLongMousePress(WebCore::IntPoint mouseDownPosition, WebKit::WebHitTestResult::Data hitTestResultData, WebKit::UserData userData)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -421,15 +421,6 @@
</span><span class="cx"> m_page->send(Messages::WebPageProxy::SetStatusText(statusbarText));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebChromeClient::shouldInterruptJavaScript()
-{
- bool shouldInterrupt = false;
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::ShouldInterruptJavaScript(), Messages::WebPageProxy::ShouldInterruptJavaScript::Reply(shouldInterrupt), m_page->pageID()))
- return false;
-
- return shouldInterrupt;
-}
-
</del><span class="cx"> KeyboardUIMode WebChromeClient::keyboardUIMode()
</span><span class="cx"> {
</span><span class="cx"> return m_page->keyboardUIMode();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (185720 => 185721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-06-18 20:44:01 UTC (rev 185720)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-06-18 20:59:12 UTC (rev 185721)
</span><span class="lines">@@ -101,7 +101,6 @@
</span><span class="cx"> virtual bool runJavaScriptConfirm(WebCore::Frame*, const String&) override;
</span><span class="cx"> virtual bool runJavaScriptPrompt(WebCore::Frame*, const String& message, const String& defaultValue, String& result) override;
</span><span class="cx"> virtual void setStatusbarText(const String&) override;
</span><del>- virtual bool shouldInterruptJavaScript() override;
</del><span class="cx">
</span><span class="cx"> virtual WebCore::KeyboardUIMode keyboardUIMode() override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>