<!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>[185840] 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/185840">185840</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-06-22 13:10:50 -0700 (Mon, 22 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Content Extensions] Add SPI to reload without content blocking.
https://bugs.webkit.org/show_bug.cgi?id=146128
rdar://problem/20351903
Reviewed by Sam Weinig.
Source/WebCore:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::loadResource):
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::willSendRequest):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::open):
* page/Page.h:
(WebCore::Page::userContentController):
(WebCore::Page::userContentExtensionsEnabled):
(WebCore::Page::setUserContentExtensionsEnabled):
(WebCore::Page::group):
* page/UserContentController.cpp:
(WebCore::UserContentController::removeAllUserContentExtensions):
(WebCore::UserContentController::processContentExtensionRulesForLoad):
(WebCore::UserContentController::actionsForResourceLoad):
* page/UserContentController.h:
Source/WebKit2:
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
* UIProcess/API/C/WKPage.cpp:
(WKPageSetCustomUserAgent):
(WKPageSetUserContentExtensionsEnabled):
(WKPageSupportsTextEncoding):
* UIProcess/API/C/WKPage.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _customUserAgent]):
(-[WKWebView _setUserContentExtensionsEnabled:]):
(-[WKWebView _userContentExtensionsEnabled]):
(-[WKWebView _setCustomUserAgent:]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::creationParameters):
(WebKit::WebPageProxy::setShouldScaleViewToFitDocument):
(WebKit::WebPageProxy::setUserContentExtensionsEnabled):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::userContentExtensionsEnabled):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::reinitializeWebPage):
(WebKit::WebPage::setShouldScaleViewToFitDocument):
(WebKit::WebPage::setUserContentExtensionsEnabled):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
Pass a boolean from the API to WebCore.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepageUserContentControllercpp">trunk/Source/WebCore/page/UserContentController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageUserContentControllerh">trunk/Source/WebCore/page/UserContentController.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParameterscpp">trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebCore/ChangeLog 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-06-20 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Add SPI to reload without content blocking.
+ https://bugs.webkit.org/show_bug.cgi?id=146128
+ rdar://problem/20351903
+
+ Reviewed by Sam Weinig.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::loadResource):
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::willSendRequest):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestResource):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::open):
+ * page/Page.h:
+ (WebCore::Page::userContentController):
+ (WebCore::Page::userContentExtensionsEnabled):
+ (WebCore::Page::setUserContentExtensionsEnabled):
+ (WebCore::Page::group):
+ * page/UserContentController.cpp:
+ (WebCore::UserContentController::removeAllUserContentExtensions):
+ (WebCore::UserContentController::processContentExtensionRulesForLoad):
+ (WebCore::UserContentController::actionsForResourceLoad):
+ * page/UserContentController.h:
+
</ins><span class="cx"> 2015-06-22 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r169105) Dangling renderer pointer in SelectionSubtreeRoot::SelectionSubtreeData.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -1167,7 +1167,7 @@
</span><span class="cx"> DocumentLoader* documentLoader = frame->loader().documentLoader();
</span><span class="cx">
</span><span class="cx"> if (page->userContentController() && documentLoader)
</span><del>- page->userContentController()->processContentExtensionRulesForLoad(request, ResourceType::Media, *documentLoader);
</del><ins>+ page->userContentController()->processContentExtensionRulesForLoad(*page, request, ResourceType::Media, *documentLoader);
</ins><span class="cx">
</span><span class="cx"> if (request.isNull()) {
</span><span class="cx"> mediaLoadingFailed(MediaPlayer::FormatError);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -293,13 +293,29 @@
</span><span class="cx"> Ref<ResourceLoader> protect(*this);
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_reachedTerminalState);
</span><ins>+ ASSERT(m_resourceType != ResourceType::Invalid);
</ins><span class="cx">
</span><ins>+ if (!frameLoader()) {
+ didFail(cannotShowURLError());
+ return;
+ }
+
+ Page* page = frameLoader()->frame().page();
+ if (!page) {
+ didFail(cannotShowURLError());
+ return;
+ }
+
+ if (!m_documentLoader) {
+ didFail(cannotShowURLError());
+ return;
+ }
+
</ins><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- ASSERT(m_resourceType != ResourceType::Invalid);
</del><ins>+ auto* userContentController = page->userContentController();
+ if (userContentController)
+ userContentController->processContentExtensionRulesForLoad(*page, request, m_resourceType, *m_documentLoader);
</ins><span class="cx">
</span><del>- if (frameLoader() && frameLoader()->frame().page() && frameLoader()->frame().page()->userContentController() && m_documentLoader)
- frameLoader()->frame().page()->userContentController()->processContentExtensionRulesForLoad(request, m_resourceType, *m_documentLoader);
-
</del><span class="cx"> if (request.isNull()) {
</span><span class="cx"> didFail(cannotShowURLError());
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="cx"> if (frame() && frame()->mainFrame().page() && frame()->mainFrame().page()->userContentController() && m_documentLoader)
</span><del>- frame()->mainFrame().page()->userContentController()->processContentExtensionRulesForLoad(request.mutableResourceRequest(), toResourceType(type), *m_documentLoader);
</del><ins>+ frame()->mainFrame().page()->userContentController()->processContentExtensionRulesForLoad(*frame()->mainFrame().page(), request.mutableResourceRequest(), toResourceType(type), *m_documentLoader);
</ins><span class="cx">
</span><span class="cx"> if (request.mutableResourceRequest().isNull())
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -2147,7 +2147,7 @@
</span><span class="cx"> && firstFrame->mainFrame().page()->userContentController()
</span><span class="cx"> && firstFrame->mainFrame().document()) {
</span><span class="cx"> ResourceLoadInfo resourceLoadInfo = {firstFrame->document()->completeURL(urlString), firstFrame->mainFrame().document()->url(), ResourceType::Popup};
</span><del>- Vector<ContentExtensions::Action> actions = firstFrame->mainFrame().page()->userContentController()->actionsForResourceLoad(resourceLoadInfo);
</del><ins>+ Vector<ContentExtensions::Action> actions = firstFrame->mainFrame().page()->userContentController()->actionsForResourceLoad(*firstFrame->mainFrame().page(), resourceLoadInfo);
</ins><span class="cx"> for (const ContentExtensions::Action& action : actions) {
</span><span class="cx"> if (action.type() == ContentExtensions::ActionType::BlockLoad)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebCore/page/Page.h 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -434,6 +434,9 @@
</span><span class="cx"> UserContentController* userContentController() { return m_userContentController.get(); }
</span><span class="cx"> WEBCORE_EXPORT void setUserContentController(UserContentController*);
</span><span class="cx">
</span><ins>+ bool userContentExtensionsEnabled() const { return m_userContentExtensionsEnabled; }
+ void setUserContentExtensionsEnabled(bool enabled) { m_userContentExtensionsEnabled = enabled; }
+
</ins><span class="cx"> VisitedLinkStore& visitedLinkStore();
</span><span class="cx"> WEBCORE_EXPORT void setVisitedLinkStore(Ref<VisitedLinkStore>&&);
</span><span class="cx">
</span><span class="lines">@@ -625,6 +628,8 @@
</span><span class="cx">
</span><span class="cx"> MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
</span><span class="cx"> DismissalType m_dismissalEventBeingDispatched { DismissalType::None };
</span><ins>+
+ bool m_userContentExtensionsEnabled { true };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline PageGroup& Page::group()
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.cpp (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.cpp 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebCore/page/UserContentController.cpp 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -204,19 +204,25 @@
</span><span class="cx"> m_contentExtensionBackend->removeAllContentExtensions();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserContentController::processContentExtensionRulesForLoad(ResourceRequest& request, ResourceType resourceType, DocumentLoader& initiatingDocumentLoader)
</del><ins>+void UserContentController::processContentExtensionRulesForLoad(Page& page, ResourceRequest& request, ResourceType resourceType, DocumentLoader& initiatingDocumentLoader)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_contentExtensionBackend)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!page.userContentExtensionsEnabled())
+ return;
+
</ins><span class="cx"> m_contentExtensionBackend->processContentExtensionRulesForLoad(request, resourceType, initiatingDocumentLoader);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<ContentExtensions::Action> UserContentController::actionsForResourceLoad(const ResourceLoadInfo& resourceLoadInfo)
</del><ins>+Vector<ContentExtensions::Action> UserContentController::actionsForResourceLoad(Page& page, const ResourceLoadInfo& resourceLoadInfo)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_contentExtensionBackend)
</span><span class="cx"> return Vector<ContentExtensions::Action>();
</span><span class="cx">
</span><ins>+ if (!page.userContentExtensionsEnabled())
+ return Vector<ContentExtensions::Action>();
+
</ins><span class="cx"> return m_contentExtensionBackend->actionsForResourceLoad(resourceLoadInfo);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserContentControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserContentController.h (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserContentController.h 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebCore/page/UserContentController.h 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx"> WEBCORE_EXPORT void removeUserContentExtension(const String& name);
</span><span class="cx"> WEBCORE_EXPORT void removeAllUserContentExtensions();
</span><span class="cx">
</span><del>- void processContentExtensionRulesForLoad(ResourceRequest&, ResourceType, DocumentLoader& initiatingDocumentLoader);
- Vector<ContentExtensions::Action> actionsForResourceLoad(const ResourceLoadInfo&);
</del><ins>+ void processContentExtensionRulesForLoad(Page&, ResourceRequest&, ResourceType, DocumentLoader& initiatingDocumentLoader);
+ Vector<ContentExtensions::Action> actionsForResourceLoad(Page&, const ResourceLoadInfo&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-06-20 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Add SPI to reload without content blocking.
+ https://bugs.webkit.org/show_bug.cgi?id=146128
+ rdar://problem/20351903
+
+ Reviewed by Sam Weinig.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetCustomUserAgent):
+ (WKPageSetUserContentExtensionsEnabled):
+ (WKPageSupportsTextEncoding):
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _customUserAgent]):
+ (-[WKWebView _setUserContentExtensionsEnabled:]):
+ (-[WKWebView _userContentExtensionsEnabled]):
+ (-[WKWebView _setCustomUserAgent:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::creationParameters):
+ (WebKit::WebPageProxy::setShouldScaleViewToFitDocument):
+ (WebKit::WebPageProxy::setUserContentExtensionsEnabled):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::userContentExtensionsEnabled):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::reinitializeWebPage):
+ (WebKit::WebPage::setShouldScaleViewToFitDocument):
+ (WebKit::WebPage::setUserContentExtensionsEnabled):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ Pass a boolean from the API to WebCore.
+
</ins><span class="cx"> 2015-06-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove m_clientRunLoop from IPC::Connection
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -84,6 +84,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> encoder << appleMailPaginationQuirkEnabled;
</span><span class="cx"> encoder << shouldScaleViewToFitDocument;
</span><ins>+ encoder << userContentExtensionsEnabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPageCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebPageCreationParameters& parameters)
</span><span class="lines">@@ -188,6 +189,9 @@
</span><span class="cx"> if (!decoder.decode(parameters.shouldScaleViewToFitDocument))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!decoder.decode(parameters.userContentExtensionsEnabled))
+ return false;
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> bool appleMailPaginationQuirkEnabled;
</span><span class="cx"> bool shouldScaleViewToFitDocument;
</span><ins>+ bool userContentExtensionsEnabled;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -351,6 +351,11 @@
</span><span class="cx"> toImpl(pageRef)->setCustomUserAgent(toWTFString(userAgentRef));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPageSetUserContentExtensionsEnabled(WKPageRef pageRef, bool enabled)
+{
+ toImpl(pageRef)->setUserContentExtensionsEnabled(enabled);
+}
+
</ins><span class="cx"> bool WKPageSupportsTextEncoding(WKPageRef pageRef)
</span><span class="cx"> {
</span><span class="cx"> return toImpl(pageRef)->supportsTextEncoding();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -123,6 +123,8 @@
</span><span class="cx"> WK_EXPORT WKStringRef WKPageCopyCustomUserAgent(WKPageRef page);
</span><span class="cx"> WK_EXPORT void WKPageSetCustomUserAgent(WKPageRef page, WKStringRef userAgent);
</span><span class="cx">
</span><ins>+WK_EXPORT void WKPageSetUserContentExtensionsEnabled(WKPageRef, bool);
+
</ins><span class="cx"> WK_EXPORT bool WKPageSupportsTextEncoding(WKPageRef page);
</span><span class="cx"> WK_EXPORT WKStringRef WKPageCopyCustomTextEncodingName(WKPageRef page);
</span><span class="cx"> WK_EXPORT void WKPageSetCustomTextEncodingName(WKPageRef page, WKStringRef encodingName);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -1900,7 +1900,6 @@
</span><span class="cx"> - (NSString *)_customUserAgent
</span><span class="cx"> {
</span><span class="cx"> return self.customUserAgent;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setCustomUserAgent:(NSString *)customUserAgent
</span><span class="lines">@@ -1908,6 +1907,16 @@
</span><span class="cx"> self.customUserAgent = customUserAgent;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_setUserContentExtensionsEnabled:(BOOL)userContentExtensionsEnabled
+{
+ _page->setUserContentExtensionsEnabled(userContentExtensionsEnabled);
+}
+
+- (BOOL)_userContentExtensionsEnabled
+{
+ return _page->userContentExtensionsEnabled();
+}
+
</ins><span class="cx"> - (pid_t)_webProcessIdentifier
</span><span class="cx"> {
</span><span class="cx"> return _page->isValid() ? _page->processIdentifier() : 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -73,6 +73,8 @@
</span><span class="cx"> @property (copy, setter=_setApplicationNameForUserAgent:) NSString *_applicationNameForUserAgent;
</span><span class="cx"> @property (copy, setter=_setCustomUserAgent:) NSString *_customUserAgent;
</span><span class="cx">
</span><ins>+@property (nonatomic, setter=_setUserContentExtensionsEnabled:) BOOL _userContentExtensionsEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> @property (nonatomic, readonly) pid_t _webProcessIdentifier;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, getter=_isEditable, setter=_setEditable:) BOOL _editable WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -5047,6 +5047,7 @@
</span><span class="cx"> parameters.appleMailPaginationQuirkEnabled = false;
</span><span class="cx"> #endif
</span><span class="cx"> parameters.shouldScaleViewToFitDocument = m_shouldScaleViewToFitDocument;
</span><ins>+ parameters.userContentExtensionsEnabled = m_userContentExtensionsEnabled;
</ins><span class="cx">
</span><span class="cx"> return parameters;
</span><span class="cx"> }
</span><span class="lines">@@ -5905,4 +5906,17 @@
</span><span class="cx"> m_process->send(Messages::WebPage::SetShouldScaleViewToFitDocument(shouldScaleViewToFitDocument), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::setUserContentExtensionsEnabled(bool userContentExtensionsEnabled)
+{
+ if (m_userContentExtensionsEnabled == userContentExtensionsEnabled)
+ return;
+
+ m_userContentExtensionsEnabled = userContentExtensionsEnabled;
+
+ if (!isValid())
+ return;
+
+ m_process->send(Messages::WebPage::SetUserContentExtensionsEnabled(userContentExtensionsEnabled), m_pageID);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -659,6 +659,9 @@
</span><span class="cx"> void scaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, std::function<void (const WebCore::MachSendRight&, CallbackBase::Error)>);
</span><span class="cx"> #endif
</span><span class="cx"> void setShouldScaleViewToFitDocument(bool);
</span><ins>+
+ bool userContentExtensionsEnabled() { return m_userContentExtensionsEnabled; }
+ void setUserContentExtensionsEnabled(bool);
</ins><span class="cx">
</span><span class="cx"> float deviceScaleFactor() const;
</span><span class="cx"> void setIntrinsicDeviceScaleFactor(float);
</span><span class="lines">@@ -1745,6 +1748,7 @@
</span><span class="cx"> bool m_requiresTargetMonitoring { false };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ bool m_userContentExtensionsEnabled { true };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -515,6 +515,8 @@
</span><span class="cx">
</span><span class="cx"> if (parameters.viewScaleFactor != 1)
</span><span class="cx"> scaleView(parameters.viewScaleFactor);
</span><ins>+
+ m_page->setUserContentExtensionsEnabled(parameters.userContentExtensionsEnabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::reinitializeWebPage(const WebPageCreationParameters& parameters)
</span><span class="lines">@@ -5022,4 +5024,12 @@
</span><span class="cx"> m_drawingArea->setShouldScaleViewToFitDocument(shouldScaleViewToFitDocument);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::setUserContentExtensionsEnabled(bool userContentExtensionsEnabled)
+{
+ if (!m_page)
+ return;
+
+ m_page->setUserContentExtensionsEnabled(userContentExtensionsEnabled);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -1136,6 +1136,7 @@
</span><span class="cx"> void clearWheelEventTestTrigger();
</span><span class="cx">
</span><span class="cx"> void setShouldScaleViewToFitDocument(bool);
</span><ins>+ void setUserContentExtensionsEnabled(bool);
</ins><span class="cx">
</span><span class="cx"> uint64_t m_pageID;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (185839 => 185840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-06-22 19:52:51 UTC (rev 185839)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-06-22 20:10:50 UTC (rev 185840)
</span><span class="lines">@@ -434,4 +434,5 @@
</span><span class="cx">
</span><span class="cx"> ClearWheelEventTestTrigger()
</span><span class="cx"> SetShouldScaleViewToFitDocument(bool shouldScaleViewToFitDocument)
</span><ins>+ SetUserContentExtensionsEnabled(bool userContentExtensionsEnabled)
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>