Diff
Modified: trunk/Source/WebCore/ChangeLog (185720 => 185721)
--- 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)
@@ -1,3 +1,22 @@
+2015-06-18 Anders Carlsson <[email protected]>
+
+ 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:
+
2015-06-18 Benjamin Poulain <[email protected]>
[CSS JIT][ARMv7] The pseudo element early exit trashes r6
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (185720 => 185721)
--- 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)
@@ -149,7 +149,7 @@
const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
ASSERT(thisObject->impl().frame());
Page* page = thisObject->impl().frame()->page();
- return shouldInterruptScriptToPreventInfiniteRecursionWhenClosingPage(page) || page->chrome().shouldInterruptJavaScript();
+ return shouldInterruptScriptToPreventInfiniteRecursionWhenClosingPage(page);
}
bool JSDOMWindowBase::shouldInterruptScriptBeforeTimeout(const JSGlobalObject* object)
Modified: trunk/Source/WebCore/loader/EmptyClients.h (185720 => 185721)
--- 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)
@@ -114,7 +114,6 @@
virtual void runJavaScriptAlert(Frame*, const String&) override { }
virtual bool runJavaScriptConfirm(Frame*, const String&) override { return false; }
virtual bool runJavaScriptPrompt(Frame*, const String&, const String&, String&) override { return false; }
- virtual bool shouldInterruptJavaScript() override { return false; }
virtual bool selectItemWritingDirectionIsNatural() override { return false; }
virtual bool selectItemAlignmentFollowsMenuWritingDirection() override { return false; }
Modified: trunk/Source/WebCore/page/Chrome.cpp (185720 => 185721)
--- 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)
@@ -347,15 +347,6 @@
m_client.setStatusbarText(frame->displayStringModifiedByEncoding(status));
}
-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();
-}
-
IntRect Chrome::windowResizerRect() const
{
return m_client.windowResizerRect();
Modified: trunk/Source/WebCore/page/Chrome.h (185720 => 185721)
--- 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)
@@ -145,7 +145,6 @@
bool runJavaScriptConfirm(Frame*, const String&);
bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result);
WEBCORE_EXPORT void setStatusbarText(Frame*, const String&);
- bool shouldInterruptJavaScript();
IntRect windowResizerRect() const;
Modified: trunk/Source/WebCore/page/ChromeClient.h (185720 => 185721)
--- 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)
@@ -146,7 +146,6 @@
virtual bool runJavaScriptConfirm(Frame*, const String&) = 0;
virtual bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result) = 0;
virtual void setStatusbarText(const String&) = 0;
- virtual bool shouldInterruptJavaScript() = 0;
virtual KeyboardUIMode keyboardUIMode() = 0;
virtual IntRect windowResizerRect() const = 0;
Modified: trunk/Source/WebKit/mac/ChangeLog (185720 => 185721)
--- 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)
@@ -1,3 +1,15 @@
+2015-06-18 Anders Carlsson <[email protected]>
+
+ 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:
+
2015-06-17 Alex Christensen <[email protected]>
[Content Extensions] Log blocked loads to the WebInspector console
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (185720 => 185721)
--- 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)
@@ -89,7 +89,6 @@
virtual void runJavaScriptAlert(WebCore::Frame*, const WTF::String&) override;
virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&) override;
virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result) override;
- virtual bool shouldInterruptJavaScript() override;
virtual WebCore::IntRect windowResizerRect() const override;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (185720 => 185721)
--- 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)
@@ -548,11 +548,6 @@
return !result.isNull();
}
-bool WebChromeClient::shouldInterruptJavaScript()
-{
- return CallUIDelegateReturningBoolean(NO, m_webView, @selector(webViewShouldInterruptJavaScript:));
-}
-
void WebChromeClient::setStatusbarText(const String& status)
{
// We want the temporaries allocated here to be released even before returning to the
Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (185720 => 185721)
--- 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)
@@ -214,8 +214,6 @@
#endif
- (void)webView:(WebView *)sender didDrawRect:(NSRect)rect;
- (void)webView:(WebView *)sender didScrollDocumentInFrameView:(WebFrameView *)frameView;
-// FIXME: If we ever make this method public, it should include a WebFrame parameter.
-- (BOOL)webViewShouldInterruptJavaScript:(WebView *)sender;
#if !TARGET_OS_IPHONE
- (void)webView:(WebView *)sender willPopupMenu:(NSMenu *)menu;
- (void)webView:(WebView *)sender contextMenuItemSelected:(NSMenuItem *)item forElement:(NSDictionary *)element;
Modified: trunk/Source/WebKit/win/ChangeLog (185720 => 185721)
--- 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)
@@ -1,3 +1,15 @@
+2015-06-18 Anders Carlsson <[email protected]>
+
+ 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:
+
2015-06-17 Hyungwook Lee <[email protected]>
[Win]Implement layoutTestController.dispatchPendingLoadRequests.
Modified: trunk/Source/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl (185720 => 185721)
--- 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)
@@ -54,7 +54,7 @@
HRESULT unused2();
HRESULT webViewScrolled([in] IWebView* sender);
HRESULT webViewAddMessageToConsole([in] IWebView* sender, [in] BSTR message, [in] int lineNumber, [in] BSTR url, [in] BOOL isError);
- HRESULT webViewShouldInterruptJavaScript([in] IWebView* sender, [out, retval] BOOL* result);
+ HRESULT unused3();
HRESULT webViewReceivedFocus([in] IWebView* sender);
HRESULT webViewLostFocus([in] IWebView* sender, [in] HWND loseFocusToHWnd);
HRESULT doDragDrop([in] IWebView* sender, [in] IDataObject* dataObject, [in] IDropSource* dropSource, [in] DWORD okEffect, [out, retval] DWORD* performedEffect);
@@ -62,7 +62,7 @@
HRESULT webViewPainted([in] IWebView* sender);
HRESULT exceededDatabaseQuota([in] IWebView* sender, [in] IWebFrame* frame, [in] IWebSecurityOrigin* origin, [in] BSTR databaseIdentifier);
HRESULT embeddedViewWithArguments([in] IWebView* sender, [in] IWebFrame* frame, [in] IPropertyBag* arguments, [out, retval] IWebEmbeddedView** view);
- HRESULT unused3();
+ HRESULT unused4();
HRESULT webViewClosing([in] IWebView* sender);
HRESULT webViewSetCursor([in] IWebView* sender, [in] HCURSOR cursor);
HRESULT webViewDidInvalidate([in] IWebView* sender);
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (185720 => 185721)
--- 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)
@@ -431,20 +431,6 @@
}
}
-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;
-}
-
KeyboardUIMode WebChromeClient::keyboardUIMode()
{
BOOL enabled = FALSE;
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (185720 => 185721)
--- 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)
@@ -88,7 +88,6 @@
virtual bool runJavaScriptConfirm(WebCore::Frame*, const WTF::String&);
virtual bool runJavaScriptPrompt(WebCore::Frame*, const WTF::String& message, const WTF::String& defaultValue, WTF::String& result);
virtual void setStatusbarText(const WTF::String&);
- virtual bool shouldInterruptJavaScript();
virtual WebCore::KeyboardUIMode keyboardUIMode();
virtual WebCore::IntRect windowResizerRect() const;
Modified: trunk/Source/WebKit2/ChangeLog (185720 => 185721)
--- 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)
@@ -1,3 +1,23 @@
+2015-06-18 Anders Carlsson <[email protected]>
+
+ 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:
+
2015-06-18 Tim Horton <[email protected]>
Use SFSafariViewController for previews
Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (185720 => 185721)
--- 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)
@@ -141,8 +141,6 @@
virtual void saveDataToFileInDownloadsFolder(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, const WTF::String&, API::Data*) { }
- virtual bool shouldInterruptJavaScript(WebKit::WebPageProxy*) { return false; }
-
virtual void pinnedStateDidChange(WebKit::WebPageProxy&) { }
virtual void didBeginTrackingPotentialLongMousePress(WebKit::WebPageProxy*, const WebCore::IntPoint&, const WebKit::WebHitTestResult::Data&, API::Object*) { }
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (185720 => 185721)
--- 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)
@@ -1729,14 +1729,6 @@
m_client.saveDataToFileInDownloadsFolder(toAPI(page), toAPI(suggestedFilename.impl()), toAPI(mimeType.impl()), toURLRef(originatingURLString.impl()), toAPI(data), m_client.base.clientInfo);
}
- virtual bool shouldInterruptJavaScript(WebPageProxy* page) override
- {
- if (!m_client.shouldInterruptJavaScript)
- return false;
-
- return m_client.shouldInterruptJavaScript(toAPI(page), m_client.base.clientInfo);
- }
-
virtual void pinnedStateDidChange(WebPageProxy& page) override
{
if (!m_client.pinnedStateDidChange)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (185720 => 185721)
--- 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)
@@ -80,7 +80,6 @@
typedef void (*WKPageDrawFooterCallback)(WKPageRef page, WKFrameRef frame, WKRect rect, const void* clientInfo);
typedef void (*WKPagePrintFrameCallback)(WKPageRef page, WKFrameRef frame, const void* clientInfo);
typedef void (*WKPageSaveDataToFileInDownloadsFolderCallback)(WKPageRef page, WKStringRef suggestedFilename, WKStringRef mimeType, WKURLRef originatingURL, WKDataRef data, const void* clientInfo);
-typedef bool (*WKPageShouldInterruptJavaScriptCallback)(WKPageRef page, const void *clientInfo);
typedef void (*WKPageDecidePolicyForNotificationPermissionRequestCallback)(WKPageRef page, WKSecurityOriginRef origin, WKNotificationPermissionRequestRef permissionRequest, const void *clientInfo);
typedef void (*WKPageShowColorPickerCallback)(WKPageRef page, WKStringRef initialColor, WKColorPickerResultListenerRef listener, const void* clientInfo);
typedef void (*WKPageHideColorPickerCallback)(WKPageRef page, const void* clientInfo);
@@ -146,7 +145,7 @@
WKPageUIClientCallback runModal;
void* unused1; // Used to be didCompleteRubberBandForMainFrame
WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
+ void* shouldInterruptJavaScript_unavailable;
} WKPageUIClientV0;
typedef struct WKPageUIClientV1 {
@@ -191,7 +190,7 @@
WKPageUIClientCallback runModal;
void* unused1; // Used to be didCompleteRubberBandForMainFrame
WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
+ void* shouldInterruptJavaScript_unavailable;
// Version 1.
WKPageCreateNewPageCallback createNewPage;
@@ -242,7 +241,7 @@
WKPageUIClientCallback runModal;
void* unused1; // Used to be didCompleteRubberBandForMainFrame
WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
+ void* shouldInterruptJavaScript_unavailable;
// Version 1.
WKPageCreateNewPageCallback createNewPage;
@@ -298,7 +297,7 @@
WKPageUIClientCallback runModal;
void* unused1; // Used to be didCompleteRubberBandForMainFrame
WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
+ void* shouldInterruptJavaScript_unavailable;
// Version 1.
WKPageCreateNewPageCallback createNewPage;
@@ -357,7 +356,7 @@
WKPageUIClientCallback runModal;
void* unused1; // Used to be didCompleteRubberBandForMainFrame
WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
+ void* shouldInterruptJavaScript_unavailable;
// Version 1.
WKPageCreateNewPageCallback createNewPage;
@@ -422,7 +421,7 @@
WKPageUIClientCallback runModal;
void* unused1; // Used to be didCompleteRubberBandForMainFrame
WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
+ void* shouldInterruptJavaScript_unavailable;
// Version 1.
WKPageCreateNewPageCallback createNewPage;
@@ -493,7 +492,7 @@
WKPageUIClientCallback runModal;
void* unused1; // Used to be didCompleteRubberBandForMainFrame
WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
- WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
+ void* shouldInterruptJavaScript_unavailable;
// Version 1.
WKPageCreateNewPageCallback createNewPage;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (185720 => 185721)
--- 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)
@@ -3497,14 +3497,6 @@
m_uiClient->runJavaScriptPrompt(this, message, defaultValue, frame, [reply](const String& result) { reply->send(result); });
}
-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);
-}
-
void WebPageProxy::setStatusText(const String& text)
{
m_uiClient->setStatusText(this, text);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (185720 => 185721)
--- 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)
@@ -1141,7 +1141,6 @@
void runJavaScriptAlert(uint64_t frameID, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply>);
void runJavaScriptConfirm(uint64_t frameID, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply>);
void runJavaScriptPrompt(uint64_t frameID, const String&, const String&, RefPtr<Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply>);
- void shouldInterruptJavaScript(bool& result);
void setStatusText(const String&);
void mouseDidMoveOverElement(const WebHitTestResult::Data& hitTestResultData, uint32_t modifiers, const UserData&);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (185720 => 185721)
--- 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)
@@ -28,7 +28,6 @@
RunJavaScriptAlert(uint64_t frameID, String message) -> () Delayed
RunJavaScriptConfirm(uint64_t frameID, String message) -> (bool result) Delayed
RunJavaScriptPrompt(uint64_t frameID, String message, String defaultValue) -> (String result) Delayed
- ShouldInterruptJavaScript() -> (bool shouldInterupt)
MouseDidMoveOverElement(WebKit::WebHitTestResult::Data hitTestResultData, uint32_t modifiers, WebKit::UserData userData)
DidBeginTrackingPotentialLongMousePress(WebCore::IntPoint mouseDownPosition, WebKit::WebHitTestResult::Data hitTestResultData, WebKit::UserData userData)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (185720 => 185721)
--- 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)
@@ -421,15 +421,6 @@
m_page->send(Messages::WebPageProxy::SetStatusText(statusbarText));
}
-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;
-}
-
KeyboardUIMode WebChromeClient::keyboardUIMode()
{
return m_page->keyboardUIMode();
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (185720 => 185721)
--- 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)
@@ -101,7 +101,6 @@
virtual bool runJavaScriptConfirm(WebCore::Frame*, const String&) override;
virtual bool runJavaScriptPrompt(WebCore::Frame*, const String& message, const String& defaultValue, String& result) override;
virtual void setStatusbarText(const String&) override;
- virtual bool shouldInterruptJavaScript() override;
virtual WebCore::KeyboardUIMode keyboardUIMode() override;
