<!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>[181222] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181222">181222</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-08 00:10:24 -0800 (Sun, 08 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove willDestroyFrame in WKBundlePageLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=142389
Reviewed by Anders Carlsson.
Source/WebKit2:
I added willDestroyFrame in <a href="http://trac.webkit.org/projects/webkit/changeset/154540">r154540</a> but I realized recently that
it has never actually worked. Adding the callback to
WKBundlePageLoaderClient was the first mistake, since frames are
handled by WebProcess and DidDestroyFrame message is indeed a
WebProcessProxy not a WebPageProxy one. Second mistake was calling
the callback from WebFrameLoaderClient::frameLoaderDestroyed(),
since at that point the frame has already been detached from the
page and so WebFrame::page() always returns nullptr. So, this in
fact dead code and since <a href="http://trac.webkit.org/projects/webkit/changeset/180211">r180211</a> nobody is using it.
* WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h:
* WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
(webkitWebPageCreate): Use verion 6 instead of version 7 of loader client.
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
(WebKit::InjectedBundlePageLoaderClient::willDestroyFrame): Deleted.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::frameLoaderDestroyed):
Tools:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::InjectedBundlePage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageLoaderClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181221 => 181222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-08 06:51:22 UTC (rev 181221)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-08 08:10:24 UTC (rev 181222)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-03-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Remove willDestroyFrame in WKBundlePageLoaderClient
+ https://bugs.webkit.org/show_bug.cgi?id=142389
+
+ Reviewed by Anders Carlsson.
+
+ I added willDestroyFrame in r154540 but I realized recently that
+ it has never actually worked. Adding the callback to
+ WKBundlePageLoaderClient was the first mistake, since frames are
+ handled by WebProcess and DidDestroyFrame message is indeed a
+ WebProcessProxy not a WebPageProxy one. Second mistake was calling
+ the callback from WebFrameLoaderClient::frameLoaderDestroyed(),
+ since at that point the frame has already been detached from the
+ page and so WebFrame::page() always returns nullptr. So, this in
+ fact dead code and since r180211 nobody is using it.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+ (webkitWebPageCreate): Use verion 6 instead of version 7 of loader client.
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+ (WebKit::InjectedBundlePageLoaderClient::willDestroyFrame): Deleted.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::frameLoaderDestroyed):
+
</ins><span class="cx"> 2015-03-06 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Move compiling of content extensions to the UIProcess
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h (181221 => 181222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 2015-03-08 06:51:22 UTC (rev 181221)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 2015-03-08 08:10:24 UTC (rev 181222)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> typedef void (*WKBundlePageFeaturesUsedInPageCallback)(WKBundlePageRef page, WKArrayRef featureStrings, const void *clientInfo);
</span><span class="cx"> typedef void (*WKBundlePageWillLoadURLRequestCallback)(WKBundlePageRef page, WKURLRequestRef request, WKTypeRef userData, const void *clientInfo);
</span><span class="cx"> typedef void (*WKBundlePageWillLoadDataRequestCallback)(WKBundlePageRef page, WKURLRequestRef request, WKDataRef data, WKStringRef MIMEType, WKStringRef encodingName, WKURLRef unreachableURL, WKTypeRef userData, const void *clientInfo);
</span><del>-typedef void (*WKBundlePageWillDestroyFrame)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
</del><span class="cx"> typedef WKStringRef (*WKBundlePageUserAgentForURLCallback)(WKBundleFrameRef frame, WKURLRef url, const void *clientInfo);
</span><span class="cx">
</span><span class="cx"> typedef struct WKBundlePageLoaderClientBase {
</span><span class="lines">@@ -404,7 +403,7 @@
</span><span class="cx"> WKBundlePageWillLoadDataRequestCallback willLoadDataRequest;
</span><span class="cx">
</span><span class="cx"> // Version 7
</span><del>- WKBundlePageWillDestroyFrame willDestroyFrame;
</del><ins>+ void * willDestroyFrame_unavailable;
</ins><span class="cx"> } WKBundlePageLoaderClientV7;
</span><span class="cx">
</span><span class="cx"> typedef struct WKBundlePageLoaderClientV8 {
</span><span class="lines">@@ -459,7 +458,7 @@
</span><span class="cx"> WKBundlePageWillLoadDataRequestCallback willLoadDataRequest;
</span><span class="cx">
</span><span class="cx"> // Version 7
</span><del>- WKBundlePageWillDestroyFrame willDestroyFrame;
</del><ins>+ void * willDestroyFrame_unavailable;
</ins><span class="cx">
</span><span class="cx"> // Version 8
</span><span class="cx"> WKBundlePageUserAgentForURLCallback userAgentForURL;
</span><span class="lines">@@ -519,7 +518,7 @@
</span><span class="cx"> WKBundlePageWillLoadDataRequestCallback willLoadDataRequest;
</span><span class="cx">
</span><span class="cx"> // Version 7
</span><del>- WKBundlePageWillDestroyFrame willDestroyFrame;
</del><ins>+ void * willDestroyFrame_unavailable;
</ins><span class="cx"> } WKBundlePageLoaderClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
</span><span class="cx">
</span><span class="cx"> #endif // WKBundlePageLoaderClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (181221 => 181222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2015-03-08 06:51:22 UTC (rev 181221)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2015-03-08 08:10:24 UTC (rev 181222)
</span><span class="lines">@@ -399,9 +399,9 @@
</span><span class="cx"> WebKitWebPage* page = WEBKIT_WEB_PAGE(g_object_new(WEBKIT_TYPE_WEB_PAGE, NULL));
</span><span class="cx"> page->priv->webPage = webPage;
</span><span class="cx">
</span><del>- WKBundlePageLoaderClientV7 loaderClient = {
</del><ins>+ WKBundlePageLoaderClientV6 loaderClient = {
</ins><span class="cx"> {
</span><del>- 7, // version
</del><ins>+ 6, // version
</ins><span class="cx"> page, // clientInfo
</span><span class="cx"> },
</span><span class="cx"> didStartProvisionalLoadForFrame,
</span><span class="lines">@@ -438,7 +438,6 @@
</span><span class="cx"> 0, // featuresUsedInPage
</span><span class="cx"> 0, // willLoadURLRequest
</span><span class="cx"> 0, // willLoadDataRequest
</span><del>- 0, // willDestroyFrame
</del><span class="cx"> };
</span><span class="cx"> WKBundlePageSetPageLoaderClient(toAPI(webPage), &loaderClient.base);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp (181221 => 181222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2015-03-08 06:51:22 UTC (rev 181221)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2015-03-08 08:10:24 UTC (rev 181222)
</span><span class="lines">@@ -349,14 +349,6 @@
</span><span class="cx"> return m_client.featuresUsedInPage(toAPI(page), toAPI(API::Array::createStringArray(features).get()), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePageLoaderClient::willDestroyFrame(WebPage* page, WebFrame* frame)
-{
- if (!m_client.willDestroyFrame)
- return;
-
- m_client.willDestroyFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo);
-}
-
</del><span class="cx"> API::String* InjectedBundlePageLoaderClient::userAgentForURL(WebFrame* frame, API::URL* url) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_client.userAgentForURL)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (181221 => 181222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-03-08 06:51:22 UTC (rev 181221)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-03-08 08:10:24 UTC (rev 181222)
</span><span class="lines">@@ -102,9 +102,6 @@
</span><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::frameLoaderDestroyed()
</span><span class="cx"> {
</span><del>- if (WebPage* webPage = m_frame->page())
- webPage->injectedBundleLoaderClient().willDestroyFrame(webPage, m_frame);
-
</del><span class="cx"> m_frame->invalidate();
</span><span class="cx">
</span><span class="cx"> // Balances explicit ref() in WebFrame::create().
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181221 => 181222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-08 06:51:22 UTC (rev 181221)
+++ trunk/Tools/ChangeLog 2015-03-08 08:10:24 UTC (rev 181222)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Remove willDestroyFrame in WKBundlePageLoaderClient
+ https://bugs.webkit.org/show_bug.cgi?id=142389
+
+ Reviewed by Anders Carlsson.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::InjectedBundlePage):
+
</ins><span class="cx"> 2015-03-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Increase TestWebKitAPI Test Coverage[Win] Increase TestWebKitAPI Test Coverage
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (181221 => 181222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-03-08 06:51:22 UTC (rev 181221)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-03-08 08:10:24 UTC (rev 181222)
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> 0, // featuresUsedInPage
</span><span class="cx"> 0, // willLoadURLRequest
</span><span class="cx"> 0, // willLoadDataRequest
</span><del>- 0, // willDestroyFrame
</del><ins>+ 0, // willDestroyFrame_unavailable
</ins><span class="cx"> 0, // userAgentForURL
</span><span class="cx"> };
</span><span class="cx"> WKBundlePageSetPageLoaderClient(m_page, &loaderClient.base);
</span></span></pre>
</div>
</div>
</body>
</html>