<!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>[211221] 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/211221">211221</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-26 11:25:12 -0800 (Thu, 26 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add SPI for updating WebsitePolicies
https://bugs.webkit.org/show_bug.cgi?id=167040
Patch by Alex Christensen <achristensen@webkit.org> on 2017-01-26
Reviewed by Brady Eidson.
In <a href="http://trac.webkit.org/projects/webkit/changeset/209558">r209558</a> we added a way to send a WebsitePolicies structure to the WebProcess during navigation.
If the UIProcess wants to update these policies on a WKWebView while a page is open, we will
need to have SPI for doing so. This adds such SPI, but it's not hooked up to change functionality yet.
* UIProcess/API/C/WKPage.cpp:
(WKPageUpdateWebsitePolicies):
* UIProcess/API/C/WKPage.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _updateWebsitePolicies:]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::updateWebsitePolicies):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updateWebsitePolicies):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageh">trunk/Source/WebKit2/UIProcess/API/C/WKPage.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.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="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.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 (211220 => 211221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-26 19:21:39 UTC (rev 211220)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-26 19:25:12 UTC (rev 211221)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-01-26 Alex Christensen <achristensen@webkit.org>
+
+ Add SPI for updating WebsitePolicies
+ https://bugs.webkit.org/show_bug.cgi?id=167040
+
+ Reviewed by Brady Eidson.
+
+ In r209558 we added a way to send a WebsitePolicies structure to the WebProcess during navigation.
+ If the UIProcess wants to update these policies on a WKWebView while a page is open, we will
+ need to have SPI for doing so. This adds such SPI, but it's not hooked up to change functionality yet.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageUpdateWebsitePolicies):
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _updateWebsitePolicies:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::updateWebsitePolicies):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updateWebsitePolicies):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2017-01-26 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Threaded Compositor] Update also the contents size when creating the threaded compositor
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (211220 => 211221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2017-01-26 19:21:39 UTC (rev 211220)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2017-01-26 19:25:12 UTC (rev 211221)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include "APIPolicyClient.h"
</span><span class="cx"> #include "APISessionState.h"
</span><span class="cx"> #include "APIUIClient.h"
</span><ins>+#include "APIWebsitePolicies.h"
</ins><span class="cx"> #include "APIWindowFeatures.h"
</span><span class="cx"> #include "AuthenticationChallengeProxy.h"
</span><span class="cx"> #include "LegacySessionStateCoding.h"
</span><span class="lines">@@ -315,6 +316,11 @@
</span><span class="cx"> return toImpl(pageRef)->willHandleHorizontalScrollEvents();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPageUpdateWebsitePolicies(WKPageRef pageRef, WKWebsitePoliciesRef websitePoliciesRef)
+{
+ toImpl(pageRef)->updateWebsitePolicies(toImpl(websitePoliciesRef)->websitePolicies());
+}
+
</ins><span class="cx"> WKStringRef WKPageCopyTitle(WKPageRef pageRef)
</span><span class="cx"> {
</span><span class="cx"> return toCopiedAPI(toImpl(pageRef)->pageLoadState().title());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (211220 => 211221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2017-01-26 19:21:39 UTC (rev 211220)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2017-01-26 19:25:12 UTC (rev 211221)
</span><span class="lines">@@ -97,7 +97,9 @@
</span><span class="cx"> WK_EXPORT void WKPageTryRestoreScrollPosition(WKPageRef page);
</span><span class="cx"> WK_EXPORT WKBackForwardListRef WKPageGetBackForwardList(WKPageRef page);
</span><span class="cx"> WK_EXPORT bool WKPageWillHandleHorizontalScrollEvents(WKPageRef page);
</span><del>-
</del><ins>+
+WK_EXPORT void WKPageUpdateWebsitePolicies(WKPageRef, WKWebsitePoliciesRef);
+
</ins><span class="cx"> WK_EXPORT WKStringRef WKPageCopyTitle(WKPageRef page);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKURLRef WKPageCopyPendingAPIRequestURL(WKPageRef page);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (211220 => 211221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-01-26 19:21:39 UTC (rev 211220)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-01-26 19:25:12 UTC (rev 211221)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> #import "_WKRemoteObjectRegistryInternal.h"
</span><span class="cx"> #import "_WKSessionStateInternal.h"
</span><span class="cx"> #import "_WKVisitedLinkStoreInternal.h"
</span><ins>+#import "_WKWebsitePoliciesInternal.h"
</ins><span class="cx"> #import <WebCore/GraphicsContextCG.h>
</span><span class="cx"> #import <WebCore/IOSurface.h>
</span><span class="cx"> #import <WebCore/JSDOMBinding.h>
</span><span class="lines">@@ -3573,6 +3574,11 @@
</span><span class="cx"> _page->close();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_updateWebsitePolicies:(_WKWebsitePolicies *)websitePolicies
+{
+ _page->updateWebsitePolicies(websitePolicies->_websitePolicies->websitePolicies());
+}
+
</ins><span class="cx"> - (BOOL)_allowsRemoteInspection
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (211220 => 211221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2017-01-26 19:21:39 UTC (rev 211220)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2017-01-26 19:25:12 UTC (rev 211221)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> @class _WKIconLoadingDelegate;
</span><span class="cx"> @class _WKRemoteObjectRegistry;
</span><span class="cx"> @class _WKSessionState;
</span><ins>+@class _WKWebsitePolicies;
</ins><span class="cx"> @class _WKWebViewPrintFormatter;
</span><span class="cx">
</span><span class="cx"> @protocol WKHistoryDelegatePrivate;
</span><span class="lines">@@ -117,6 +118,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)_close;
</span><span class="cx">
</span><ins>+- (void)_updateWebsitePolicies:(_WKWebsitePolicies *)websitePolicies;
+
</ins><span class="cx"> @property (nonatomic, setter=_setLayoutMode:) _WKLayoutMode _layoutMode;
</span><span class="cx"> // For use with _layoutMode = _WKLayoutModeFixedSize:
</span><span class="cx"> @property (nonatomic, setter=_setFixedLayoutSize:) CGSize _fixedLayoutSize;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (211220 => 211221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-26 19:21:39 UTC (rev 211220)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-26 19:25:12 UTC (rev 211221)
</span><span class="lines">@@ -5895,6 +5895,11 @@
</span><span class="cx"> return !m_canShortCircuitHorizontalWheelEvents;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::updateWebsitePolicies(const WebsitePolicies& websitePolicies)
+{
+ m_process->send(Messages::WebPage::UpdateWebsitePolicies(websitePolicies), m_pageID);
+}
+
</ins><span class="cx"> void WebPageProxy::didFinishLoadingDataForCustomContentProvider(const String& suggestedFilename, const IPC::DataReference& dataReference)
</span><span class="cx"> {
</span><span class="cx"> m_pageClient.didFinishLoadingDataForCustomContentProvider(suggestedFilename, dataReference);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (211220 => 211221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-01-26 19:21:39 UTC (rev 211220)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-01-26 19:25:12 UTC (rev 211221)
</span><span class="lines">@@ -408,6 +408,8 @@
</span><span class="cx">
</span><span class="cx"> bool willHandleHorizontalScrollEvents() const;
</span><span class="cx">
</span><ins>+ void updateWebsitePolicies(const WebsitePolicies&);
+
</ins><span class="cx"> bool canShowMIMEType(const String& mimeType);
</span><span class="cx">
</span><span class="cx"> bool drawsBackground() const { return m_drawsBackground; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (211220 => 211221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-01-26 19:21:39 UTC (rev 211220)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-01-26 19:25:12 UTC (rev 211221)
</span><span class="lines">@@ -5468,6 +5468,11 @@
</span><span class="cx"> m_loaderClient.featuresUsedInPage(this, namedFeatures);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::updateWebsitePolicies(const WebsitePolicies&)
+{
+ // FIXME: Update the website policies in m_page.
+}
+
</ins><span class="cx"> unsigned WebPage::extendIncrementalRenderingSuppression()
</span><span class="cx"> {
</span><span class="cx"> unsigned token = m_maximumRenderingSuppressionToken + 1;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (211220 => 211221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-01-26 19:21:39 UTC (rev 211220)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-01-26 19:25:12 UTC (rev 211221)
</span><span class="lines">@@ -199,6 +199,7 @@
</span><span class="cx"> struct InteractionInformationRequest;
</span><span class="cx"> struct LoadParameters;
</span><span class="cx"> struct PrintInfo;
</span><ins>+struct WebsitePolicies;
</ins><span class="cx"> struct WebPageCreationParameters;
</span><span class="cx"> struct WebPreferencesStore;
</span><span class="cx"> struct WebSelectionData;
</span><span class="lines">@@ -1214,6 +1215,8 @@
</span><span class="cx">
</span><span class="cx"> void reportUsedFeatures();
</span><span class="cx">
</span><ins>+ void updateWebsitePolicies(const WebsitePolicies&);
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void performImmediateActionHitTestAtLocation(WebCore::FloatPoint);
</span><span class="cx"> RefPtr<WebCore::Range> lookupTextAtLocation(WebCore::FloatPoint, NSDictionary **options);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (211220 => 211221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2017-01-26 19:21:39 UTC (rev 211220)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2017-01-26 19:25:12 UTC (rev 211221)
</span><span class="lines">@@ -146,6 +146,7 @@
</span><span class="cx">
</span><span class="cx"> DidRemoveBackForwardItem(uint64_t backForwardItemID)
</span><span class="cx">
</span><ins>+ UpdateWebsitePolicies(struct WebKit::WebsitePolicies websitePolicies)
</ins><span class="cx"> DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, WebKit::DownloadID downloadID)
</span><span class="cx">
</span><span class="cx"> ClearSelection()
</span></span></pre>
</div>
</div>
</body>
</html>