<!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>[196720] trunk/Source/WebKit2</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/196720">196720</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-17 13:46:12 -0800 (Wed, 17 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Need listener-based version of runBeforeUnloadConfirmPanel
https://bugs.webkit.org/show_bug.cgi?id=154354
rdar://problem/23736691
Reviewed by Sam Weinig.
* Shared/API/APIObject.h:
* Shared/API/c/WKBase.h:
* UIProcess/API/APIUIClient.h:
(API::UIClient::runBeforeUnloadConfirmPanel):
* UIProcess/API/C/WKPage.cpp:
(fixUpBotchedPageUIClient):
(WebKit::RunBeforeUnloadConfirmPanelResultListener::create):
(WebKit::RunBeforeUnloadConfirmPanelResultListener::~RunBeforeUnloadConfirmPanelResultListener):
(WebKit::RunBeforeUnloadConfirmPanelResultListener::call):
(WKPageRunBeforeUnloadConfirmPanelResultListenerGetTypeID):
(WKPageRunBeforeUnloadConfirmPanelResultListenerCall):
(WKPageSetPageUIClient):
* UIProcess/API/C/WKPageUIClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::runBeforeUnloadConfirmPanel):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIObjecth">trunk/Source/WebKit2/Shared/API/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKBaseh">trunk/Source/WebKit2/Shared/API/c/WKBase.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196719 => 196720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-17 21:44:02 UTC (rev 196719)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-17 21:46:12 UTC (rev 196720)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-02-17 Anders Carlsson <andersca@apple.com>
+
+ Need listener-based version of runBeforeUnloadConfirmPanel
+ https://bugs.webkit.org/show_bug.cgi?id=154354
+ rdar://problem/23736691
+
+ Reviewed by Sam Weinig.
+
+ * Shared/API/APIObject.h:
+ * Shared/API/c/WKBase.h:
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::runBeforeUnloadConfirmPanel):
+ * UIProcess/API/C/WKPage.cpp:
+ (fixUpBotchedPageUIClient):
+ (WebKit::RunBeforeUnloadConfirmPanelResultListener::create):
+ (WebKit::RunBeforeUnloadConfirmPanelResultListener::~RunBeforeUnloadConfirmPanelResultListener):
+ (WebKit::RunBeforeUnloadConfirmPanelResultListener::call):
+ (WKPageRunBeforeUnloadConfirmPanelResultListenerGetTypeID):
+ (WKPageRunBeforeUnloadConfirmPanelResultListenerCall):
+ (WKPageSetPageUIClient):
+ * UIProcess/API/C/WKPageUIClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::runBeforeUnloadConfirmPanel):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+
</ins><span class="cx"> 2016-02-17 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> PDFPlugin's scrollableArea container is not properly unregistered when page is going into the PageCache
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (196719 => 196720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h 2016-02-17 21:44:02 UTC (rev 196719)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2016-02-17 21:46:12 UTC (rev 196720)
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx"> ProcessPoolConfiguration,
</span><span class="cx"> PluginSiteDataManager,
</span><span class="cx"> Preferences,
</span><ins>+ RunBeforeUnloadConfirmPanelResultListener,
</ins><span class="cx"> RunJavaScriptAlertResultListener,
</span><span class="cx"> RunJavaScriptConfirmResultListener,
</span><span class="cx"> RunJavaScriptPromptResultListener,
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (196719 => 196720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2016-02-17 21:44:02 UTC (rev 196719)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2016-02-17 21:46:12 UTC (rev 196720)
</span><span class="lines">@@ -128,6 +128,7 @@
</span><span class="cx"> typedef const struct OpaqueWKPluginSiteDataManager* WKPluginSiteDataManagerRef;
</span><span class="cx"> typedef const struct OpaqueWKPreferences* WKPreferencesRef;
</span><span class="cx"> typedef const struct OpaqueWKProtectionSpace* WKProtectionSpaceRef;
</span><ins>+typedef const struct OpaqueWKPageRunBeforeUnloadConfirmPanelResultListener* WKPageRunBeforeUnloadConfirmPanelResultListenerRef;
</ins><span class="cx"> typedef const struct OpaqueWKPageRunJavaScriptAlertResultListener* WKPageRunJavaScriptAlertResultListenerRef;
</span><span class="cx"> typedef const struct OpaqueWKPageRunJavaScriptConfirmResultListener* WKPageRunJavaScriptConfirmResultListenerRef;
</span><span class="cx"> typedef const struct OpaqueWKPageRunJavaScriptPromptResultListener* WKPageRunJavaScriptPromptResultListenerRef;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (196719 => 196720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2016-02-17 21:44:02 UTC (rev 196719)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2016-02-17 21:46:12 UTC (rev 196720)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> virtual WebCore::FloatRect windowFrame(WebKit::WebPageProxy*) { return WebCore::FloatRect(); }
</span><span class="cx">
</span><span class="cx"> virtual bool canRunBeforeUnloadConfirmPanel() const { return false; }
</span><del>- virtual bool runBeforeUnloadConfirmPanel(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*) { return true; }
</del><ins>+ virtual void runBeforeUnloadConfirmPanel(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (bool)> completionHandler) { completionHandler(true); }
</ins><span class="cx">
</span><span class="cx"> virtual void pageDidScroll(WebKit::WebPageProxy*) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (196719 => 196720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-02-17 21:44:02 UTC (rev 196719)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-02-17 21:46:12 UTC (rev 196720)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ClientTraits<WKPageUIClientBase> {
</span><del>- typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2, WKPageUIClientV3, WKPageUIClientV4, WKPageUIClientV5, WKPageUIClientV6> Versions;
</del><ins>+ typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2, WKPageUIClientV3, WKPageUIClientV4, WKPageUIClientV5, WKPageUIClientV6, WKPageUIClientV7> Versions;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="lines">@@ -1410,7 +1410,7 @@
</span><span class="cx"> WKPageSetIsResizableCallback setIsResizable;
</span><span class="cx"> WKPageGetWindowFrameCallback getWindowFrame;
</span><span class="cx"> WKPageSetWindowFrameCallback setWindowFrame;
</span><del>- WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
</del><ins>+ WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6 runBeforeUnloadConfirmPanel;
</ins><span class="cx"> WKPageUIClientCallback didDraw;
</span><span class="cx"> WKPageUIClientCallback pageDidScroll;
</span><span class="cx"> WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
</span><span class="lines">@@ -1515,6 +1515,31 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class RunBeforeUnloadConfirmPanelResultListener : public API::ObjectImpl<API::Object::Type::RunBeforeUnloadConfirmPanelResultListener> {
+public:
+ static PassRefPtr<RunBeforeUnloadConfirmPanelResultListener> create(std::function<void (bool)>&& completionHandler)
+ {
+ return adoptRef(new RunBeforeUnloadConfirmPanelResultListener(WTFMove(completionHandler)));
+ }
+
+ virtual ~RunBeforeUnloadConfirmPanelResultListener()
+ {
+ }
+
+ void call(bool result)
+ {
+ m_completionHandler(result);
+ }
+
+private:
+ explicit RunBeforeUnloadConfirmPanelResultListener(std::function<void (bool)>&& completionHandler)
+ : m_completionHandler(WTFMove(completionHandler))
+ {
+ }
+
+ std::function<void (bool)> m_completionHandler;
+};
+
</ins><span class="cx"> class RunJavaScriptAlertResultListener : public API::ObjectImpl<API::Object::Type::RunJavaScriptAlertResultListener> {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<RunJavaScriptAlertResultListener> create(std::function<void ()>&& completionHandler)
</span><span class="lines">@@ -1590,12 +1615,23 @@
</span><span class="cx"> std::function<void (const String&)> m_completionHandler;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WK_ADD_API_MAPPING(WKPageRunBeforeUnloadConfirmPanelResultListenerRef, RunBeforeUnloadConfirmPanelResultListener)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKPageRunJavaScriptAlertResultListenerRef, RunJavaScriptAlertResultListener)
</span><span class="cx"> WK_ADD_API_MAPPING(WKPageRunJavaScriptConfirmResultListenerRef, RunJavaScriptConfirmResultListener)
</span><span class="cx"> WK_ADD_API_MAPPING(WKPageRunJavaScriptPromptResultListenerRef, RunJavaScriptPromptResultListener)
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WKTypeID WKPageRunBeforeUnloadConfirmPanelResultListenerGetTypeID()
+{
+ return toAPI(RunBeforeUnloadConfirmPanelResultListener::APIType);
+}
+
+void WKPageRunBeforeUnloadConfirmPanelResultListenerCall(WKPageRunBeforeUnloadConfirmPanelResultListenerRef listener, bool result)
+{
+ toImpl(listener)->call(result);
+}
+
</ins><span class="cx"> WKTypeID WKPageRunJavaScriptAlertResultListenerGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> return toAPI(RunJavaScriptAlertResultListener::APIType);
</span><span class="lines">@@ -1971,15 +2007,24 @@
</span><span class="cx">
</span><span class="cx"> virtual bool canRunBeforeUnloadConfirmPanel() const override
</span><span class="cx"> {
</span><del>- return m_client.runBeforeUnloadConfirmPanel;
</del><ins>+ return m_client.runBeforeUnloadConfirmPanel_deprecatedForUseWithV6 || m_client.runBeforeUnloadConfirmPanel;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- virtual bool runBeforeUnloadConfirmPanel(WebPageProxy* page, const String& message, WebFrameProxy* frame) override
</del><ins>+ virtual void runBeforeUnloadConfirmPanel(WebKit::WebPageProxy* page, const WTF::String& message, WebKit::WebFrameProxy* frame, std::function<void (bool)> completionHandler) override
</ins><span class="cx"> {
</span><del>- if (!m_client.runBeforeUnloadConfirmPanel)
- return true;
</del><ins>+ if (m_client.runBeforeUnloadConfirmPanel) {
+ RefPtr<RunBeforeUnloadConfirmPanelResultListener> listener = RunBeforeUnloadConfirmPanelResultListener::create(WTFMove(completionHandler));
+ m_client.runBeforeUnloadConfirmPanel(toAPI(page), toAPI(message.impl()), toAPI(frame), toAPI(listener.get()), m_client.base.clientInfo);
+ return;
+ }
</ins><span class="cx">
</span><del>- return m_client.runBeforeUnloadConfirmPanel(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo);
</del><ins>+ if (m_client.runBeforeUnloadConfirmPanel_deprecatedForUseWithV6) {
+ bool result = m_client.runBeforeUnloadConfirmPanel_deprecatedForUseWithV6(toAPI(page), toAPI(message.impl()), toAPI(frame), m_client.base.clientInfo);
+ completionHandler(result);
+ return;
+ }
+
+ completionHandler(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void pageDidScroll(WebPageProxy* page) override
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (196719 => 196720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2016-02-17 21:44:02 UTC (rev 196719)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2016-02-17 21:46:12 UTC (rev 196720)
</span><span class="lines">@@ -48,6 +48,8 @@
</span><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKPluginUnavailabilityReason;
</span><span class="cx">
</span><ins>+WK_EXPORT WKTypeID WKPageRunBeforeUnloadConfirmPanelResultListenerGetTypeID();
+WK_EXPORT void WKPageRunBeforeUnloadConfirmPanelResultListenerCall(WKPageRunBeforeUnloadConfirmPanelResultListenerRef listener, bool result);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKPageRunJavaScriptAlertResultListenerGetTypeID();
</span><span class="cx"> WK_EXPORT void WKPageRunJavaScriptAlertResultListenerCall(WKPageRunJavaScriptAlertResultListenerRef listener);
</span><span class="lines">@@ -60,6 +62,7 @@
</span><span class="cx">
</span><span class="cx"> typedef void (*WKPageUIClientCallback)(WKPageRef page, const void* clientInfo);
</span><span class="cx"> typedef WKPageRef (*WKPageCreateNewPageCallback)(WKPageRef page, WKPageConfigurationRef configuration, WKNavigationActionRef navigationAction, WKWindowFeaturesRef windowFeatures, const void *clientInfo);
</span><ins>+typedef void (*WKPageRunBeforeUnloadConfirmPanelCallback)(WKPageRef page, WKStringRef message, WKFrameRef frame, WKPageRunBeforeUnloadConfirmPanelResultListenerRef listener, const void *clientInfo);
</ins><span class="cx"> typedef void (*WKPageRunJavaScriptAlertCallback)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptAlertResultListenerRef listener, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageRunJavaScriptConfirmCallback)(WKPageRef page, WKStringRef message, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptConfirmResultListenerRef listener, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageRunJavaScriptPromptCallback)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, WKSecurityOriginRef securityOrigin, WKPageRunJavaScriptPromptResultListenerRef listener, const void *clientInfo);
</span><span class="lines">@@ -80,7 +83,6 @@
</span><span class="cx"> typedef void (*WKPageSetIsResizableCallback)(WKPageRef page, bool resizable, const void *clientInfo);
</span><span class="cx"> typedef WKRect (*WKPageGetWindowFrameCallback)(WKPageRef page, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageSetWindowFrameCallback)(WKPageRef page, WKRect frame, const void *clientInfo);
</span><del>-typedef bool (*WKPageRunBeforeUnloadConfirmPanelCallback)(WKPageRef page, WKStringRef message, WKFrameRef frame, const void *clientInfo);
</del><span class="cx"> typedef unsigned long long (*WKPageExceededDatabaseQuotaCallback)(WKPageRef page, WKFrameRef frame, WKSecurityOriginRef origin, WKStringRef databaseName, WKStringRef displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageRunOpenPanelCallback)(WKPageRef page, WKFrameRef frame, WKOpenPanelParametersRef parameters, WKOpenPanelResultListenerRef listener, const void *clientInfo);
</span><span class="cx"> typedef void (*WKPageDecidePolicyForGeolocationPermissionRequestCallback)(WKPageRef page, WKFrameRef frame, WKSecurityOriginRef origin, WKGeolocationPermissionRequestRef permissionRequest, const void* clientInfo);
</span><span class="lines">@@ -113,8 +115,8 @@
</span><span class="cx"> typedef void (*WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, WKSecurityOriginRef securityOrigin, const void *clientInfo);
</span><span class="cx"> typedef bool (*WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5)(WKPageRef page, WKStringRef message, WKFrameRef frame, WKSecurityOriginRef securityOrigin, const void *clientInfo);
</span><span class="cx"> typedef WKStringRef (*WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5)(WKPageRef page, WKStringRef message, WKStringRef defaultValue, WKFrameRef frame, WKSecurityOriginRef securityOrigin, const void *clientInfo);
</span><ins>+typedef bool (*WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6)(WKPageRef page, WKStringRef message, WKFrameRef frame, const void *clientInfo);
</ins><span class="cx">
</span><del>-
</del><span class="cx"> typedef struct WKPageUIClientBase {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -148,7 +150,7 @@
</span><span class="cx"> WKPageSetIsResizableCallback setIsResizable;
</span><span class="cx"> WKPageGetWindowFrameCallback getWindowFrame;
</span><span class="cx"> WKPageSetWindowFrameCallback setWindowFrame;
</span><del>- WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
</del><ins>+ WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6 runBeforeUnloadConfirmPanel;
</ins><span class="cx"> WKPageUIClientCallback didDraw;
</span><span class="cx"> WKPageUIClientCallback pageDidScroll;
</span><span class="cx"> WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
</span><span class="lines">@@ -193,7 +195,7 @@
</span><span class="cx"> WKPageSetIsResizableCallback setIsResizable;
</span><span class="cx"> WKPageGetWindowFrameCallback getWindowFrame;
</span><span class="cx"> WKPageSetWindowFrameCallback setWindowFrame;
</span><del>- WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
</del><ins>+ WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6 runBeforeUnloadConfirmPanel;
</ins><span class="cx"> WKPageUIClientCallback didDraw;
</span><span class="cx"> WKPageUIClientCallback pageDidScroll;
</span><span class="cx"> WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
</span><span class="lines">@@ -244,7 +246,7 @@
</span><span class="cx"> WKPageSetIsResizableCallback setIsResizable;
</span><span class="cx"> WKPageGetWindowFrameCallback getWindowFrame;
</span><span class="cx"> WKPageSetWindowFrameCallback setWindowFrame;
</span><del>- WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
</del><ins>+ WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6 runBeforeUnloadConfirmPanel;
</ins><span class="cx"> WKPageUIClientCallback didDraw;
</span><span class="cx"> WKPageUIClientCallback pageDidScroll;
</span><span class="cx"> WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
</span><span class="lines">@@ -300,7 +302,7 @@
</span><span class="cx"> WKPageSetIsResizableCallback setIsResizable;
</span><span class="cx"> WKPageGetWindowFrameCallback getWindowFrame;
</span><span class="cx"> WKPageSetWindowFrameCallback setWindowFrame;
</span><del>- WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
</del><ins>+ WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6 runBeforeUnloadConfirmPanel;
</ins><span class="cx"> WKPageUIClientCallback didDraw;
</span><span class="cx"> WKPageUIClientCallback pageDidScroll;
</span><span class="cx"> WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
</span><span class="lines">@@ -359,7 +361,7 @@
</span><span class="cx"> WKPageSetIsResizableCallback setIsResizable;
</span><span class="cx"> WKPageGetWindowFrameCallback getWindowFrame;
</span><span class="cx"> WKPageSetWindowFrameCallback setWindowFrame;
</span><del>- WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
</del><ins>+ WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6 runBeforeUnloadConfirmPanel;
</ins><span class="cx"> WKPageUIClientCallback didDraw;
</span><span class="cx"> WKPageUIClientCallback pageDidScroll;
</span><span class="cx"> WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
</span><span class="lines">@@ -424,7 +426,7 @@
</span><span class="cx"> WKPageSetIsResizableCallback setIsResizable;
</span><span class="cx"> WKPageGetWindowFrameCallback getWindowFrame;
</span><span class="cx"> WKPageSetWindowFrameCallback setWindowFrame;
</span><del>- WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
</del><ins>+ WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6 runBeforeUnloadConfirmPanel;
</ins><span class="cx"> WKPageUIClientCallback didDraw;
</span><span class="cx"> WKPageUIClientCallback pageDidScroll;
</span><span class="cx"> WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
</span><span class="lines">@@ -497,7 +499,7 @@
</span><span class="cx"> WKPageSetIsResizableCallback setIsResizable;
</span><span class="cx"> WKPageGetWindowFrameCallback getWindowFrame;
</span><span class="cx"> WKPageSetWindowFrameCallback setWindowFrame;
</span><del>- WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
</del><ins>+ WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6 runBeforeUnloadConfirmPanel;
</ins><span class="cx"> WKPageUIClientCallback didDraw;
</span><span class="cx"> WKPageUIClientCallback pageDidScroll;
</span><span class="cx"> WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
</span><span class="lines">@@ -549,6 +551,89 @@
</span><span class="cx"> WKCheckUserMediaPermissionCallback checkUserMediaPermissionForOrigin;
</span><span class="cx"> } WKPageUIClientV6;
</span><span class="cx">
</span><ins>+typedef struct WKPageUIClientV7 {
+ WKPageUIClientBase base;
+
+ // Version 0.
+ WKPageCreateNewPageCallback_deprecatedForUseWithV0 createNewPage_deprecatedForUseWithV0;
+ WKPageUIClientCallback showPage;
+ WKPageUIClientCallback close;
+ WKPageTakeFocusCallback takeFocus;
+ WKPageFocusCallback focus;
+ WKPageUnfocusCallback unfocus;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
+ WKPageSetStatusTextCallback setStatusText;
+ WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
+ WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
+ WKPageDidNotHandleKeyEventCallback didNotHandleKeyEvent;
+ WKPageDidNotHandleWheelEventCallback didNotHandleWheelEvent;
+ WKPageGetToolbarsAreVisibleCallback toolbarsAreVisible;
+ WKPageSetToolbarsAreVisibleCallback setToolbarsAreVisible;
+ WKPageGetMenuBarIsVisibleCallback menuBarIsVisible;
+ WKPageSetMenuBarIsVisibleCallback setMenuBarIsVisible;
+ WKPageGetStatusBarIsVisibleCallback statusBarIsVisible;
+ WKPageSetStatusBarIsVisibleCallback setStatusBarIsVisible;
+ WKPageGetIsResizableCallback isResizable;
+ WKPageSetIsResizableCallback setIsResizable;
+ WKPageGetWindowFrameCallback getWindowFrame;
+ WKPageSetWindowFrameCallback setWindowFrame;
+ WKPageRunBeforeUnloadConfirmPanelCallback_deprecatedForUseWithV6 runBeforeUnloadConfirmPanel_deprecatedForUseWithV6;
+ WKPageUIClientCallback didDraw;
+ WKPageUIClientCallback pageDidScroll;
+ WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
+ WKPageRunOpenPanelCallback runOpenPanel;
+ WKPageDecidePolicyForGeolocationPermissionRequestCallback decidePolicyForGeolocationPermissionRequest;
+ WKPageHeaderHeightCallback headerHeight;
+ WKPageFooterHeightCallback footerHeight;
+ WKPageDrawHeaderCallback drawHeader;
+ WKPageDrawFooterCallback drawFooter;
+ WKPagePrintFrameCallback printFrame;
+ WKPageUIClientCallback runModal;
+ void* unused1; // Used to be didCompleteRubberBandForMainFrame
+ WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
+ void* shouldInterruptJavaScript_unavailable;
+
+ // Version 1.
+ WKPageCreateNewPageCallback_deprecatedForUseWithV1 createNewPage_deprecatedForUseWithV1;
+ WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
+ WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest;
+ WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1;
+
+ // Version 2.
+ WKPageShowColorPickerCallback showColorPicker;
+ WKPageHideColorPickerCallback hideColorPicker;
+ WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
+
+ // Version 3.
+ WKPagePinnedStateDidChangeCallback pinnedStateDidChange;
+
+ // Version 4.
+ void* unused2; // Used to be didBeginTrackingPotentialLongMousePress.
+ void* unused3; // Used to be didRecognizeLongMousePress.
+ void* unused4; // Used to be didCancelTrackingPotentialLongMousePress.
+ WKPageIsPlayingAudioDidChangeCallback isPlayingAudioDidChange;
+
+ // Version 5.
+ WKPageDecidePolicyForUserMediaPermissionRequestCallback decidePolicyForUserMediaPermissionRequest;
+ WKPageDidClickAutoFillButtonCallback didClickAutoFillButton;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV5 runJavaScriptAlert_deprecatedForUseWithV5;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5 runJavaScriptConfirm_deprecatedForUseWithV5;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5 runJavaScriptPrompt_deprecatedForUseWithV5;
+ WKPageMediaSessionMetadataDidChangeCallback mediaSessionMetadataDidChange;
+
+ // Version 6.
+ WKPageCreateNewPageCallback createNewPage;
+ WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
+ WKCheckUserMediaPermissionCallback checkUserMediaPermissionForOrigin;
+
+ // Version 7.
+ WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
+} WKPageUIClientV7;
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (196719 => 196720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-02-17 21:44:02 UTC (rev 196719)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-02-17 21:46:12 UTC (rev 196720)
</span><span class="lines">@@ -3768,8 +3768,8 @@
</span><span class="cx"> result = m_pageClient.rootViewToAccessibilityScreen(viewRect);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
-void WebPageProxy::runBeforeUnloadConfirmPanel(const String& message, uint64_t frameID, bool& shouldClose)
</del><ins>+
+void WebPageProxy::runBeforeUnloadConfirmPanel(const String& message, uint64_t frameID, RefPtr<Messages::WebPageProxy::RunBeforeUnloadConfirmPanel::DelayedReply> reply)
</ins><span class="cx"> {
</span><span class="cx"> WebFrameProxy* frame = m_process->webFrame(frameID);
</span><span class="cx"> MESSAGE_CHECK(frame);
</span><span class="lines">@@ -3777,7 +3777,7 @@
</span><span class="cx"> // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer.
</span><span class="cx"> m_process->responsivenessTimer().stop();
</span><span class="cx">
</span><del>- shouldClose = m_uiClient->runBeforeUnloadConfirmPanel(this, message, frame);
</del><ins>+ m_uiClient->runBeforeUnloadConfirmPanel(this, message, frame, [reply](bool result) { reply->send(result); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (196719 => 196720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-02-17 21:44:02 UTC (rev 196719)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-02-17 21:46:12 UTC (rev 196720)
</span><span class="lines">@@ -1197,7 +1197,7 @@
</span><span class="cx"> void accessibilityScreenToRootView(const WebCore::IntPoint& screenPoint, WebCore::IntPoint& windowPoint);
</span><span class="cx"> void rootViewToAccessibilityScreen(const WebCore::IntRect& viewRect, WebCore::IntRect& result);
</span><span class="cx"> #endif
</span><del>- void runBeforeUnloadConfirmPanel(const String& message, uint64_t frameID, bool& shouldClose);
</del><ins>+ void runBeforeUnloadConfirmPanel(const String& message, uint64_t frameID, RefPtr<Messages::WebPageProxy::RunBeforeUnloadConfirmPanel::DelayedReply>);
</ins><span class="cx"> void didChangeViewportProperties(const WebCore::ViewportAttributes&);
</span><span class="cx"> void pageDidScroll();
</span><span class="cx"> void runOpenPanel(uint64_t frameID, const WebCore::FileChooserSettings&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (196719 => 196720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-02-17 21:44:02 UTC (rev 196719)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-02-17 21:46:12 UTC (rev 196720)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> RootViewToAccessibilityScreen(WebCore::IntRect rect) -> (WebCore::IntRect screenFrame)
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- RunBeforeUnloadConfirmPanel(String message, uint64_t frameID) -> (bool shouldClose)
</del><ins>+ RunBeforeUnloadConfirmPanel(String message, uint64_t frameID) -> (bool shouldClose) Delayed
</ins><span class="cx"> PageDidScroll()
</span><span class="cx"> RunOpenPanel(uint64_t frameID, struct WebCore::FileChooserSettings parameters)
</span><span class="cx"> PrintFrame(uint64_t frameID) -> ()
</span></span></pre>
</div>
</div>
</body>
</html>