<!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>[204053] 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/204053">204053</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2016-08-02 17:00:59 -0700 (Tue, 02 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow building with content filtering disabled.
https://bugs.webkit.org/show_bug.cgi?id=160454
Reviewed by Simon Fraser.
Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
* Configurations/FeatureDefines.xcconfig:
* platform/PlatformContentFilter.h:
(WebCore::PlatformContentFilter::unblockRequestDeniedScript):
* platform/cocoa/NetworkExtensionContentFilter.h:
* platform/cocoa/NetworkExtensionContentFilter.mm:
(WebCore::NetworkExtensionContentFilter::unblockHandler):
* platform/cocoa/ParentalControlsContentFilter.h:
* testing/MockContentFilter.h:
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::blockedByContentFilterError):
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::ArgumentCoder<KeypressCommand>::decode):
(IPC::ArgumentCoder<ContentFilterUnblockHandler>::encode):
(IPC::ArgumentCoder<ContentFilterUnblockHandler>::decode):
* WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
(WebKit::blockedByContentFilterError):
Tools:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformContentFilterh">trunk/Source/WebCore/platform/PlatformContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaNetworkExtensionContentFilterh">trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaNetworkExtensionContentFiltermm">trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaParentalControlsContentFilterh">trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaParentalControlsContentFiltermm">trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm</a></li>
<li><a href="#trunkSourceWebCoretestingMockContentFilterh">trunk/Source/WebCore/testing/MockContentFilter.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-02 Enrica Casucci <enrica@apple.com>
+
+ Allow building with content filtering disabled.
+ https://bugs.webkit.org/show_bug.cgi?id=160454
+
+ Reviewed by Simon Fraser.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-08-02 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [ARM] Disable Inline Caching on ARMv7 traditional until proper fix
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -51,7 +51,9 @@
</span><span class="cx"> ENABLE_CANVAS_PROXY = ;
</span><span class="cx"> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
</span><span class="cx"> ENABLE_ES6_MODULES = ;
</span><del>-ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
</del><ins>+ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
+ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
</ins><span class="cx"> ENABLE_CSP_NEXT = ;
</span><span class="cx"> ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
</span><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebCore/ChangeLog 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-08-02 Enrica Casucci <enrica@apple.com>
+
+ Allow building with content filtering disabled.
+ https://bugs.webkit.org/show_bug.cgi?id=160454
+
+ Reviewed by Simon Fraser.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/PlatformContentFilter.h:
+ (WebCore::PlatformContentFilter::unblockRequestDeniedScript):
+ * platform/cocoa/NetworkExtensionContentFilter.h:
+ * platform/cocoa/NetworkExtensionContentFilter.mm:
+ (WebCore::NetworkExtensionContentFilter::unblockHandler):
+ * platform/cocoa/ParentalControlsContentFilter.h:
+ * testing/MockContentFilter.h:
+
</ins><span class="cx"> 2016-08-02 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Reapply fixes for webkit.org/b/159450 and webkit.org/b/157569
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -51,7 +51,9 @@
</span><span class="cx"> ENABLE_CANVAS_PROXY = ;
</span><span class="cx"> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
</span><span class="cx"> ENABLE_ES6_MODULES = ;
</span><del>-ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
</del><ins>+ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
+ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
</ins><span class="cx"> ENABLE_CSP_NEXT = ;
</span><span class="cx"> ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
</span><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformContentFilter.h (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformContentFilter.h 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebCore/platform/PlatformContentFilter.h 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -57,7 +57,9 @@
</span><span class="cx"> virtual void addData(const char* data, int length) = 0;
</span><span class="cx"> virtual void finishedAddingData() = 0;
</span><span class="cx"> virtual Ref<SharedBuffer> replacementData() const = 0;
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> virtual ContentFilterUnblockHandler unblockHandler() const = 0;
</span><ins>+#endif
</ins><span class="cx"> virtual String unblockRequestDeniedScript() const { return emptyString(); }
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaNetworkExtensionContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -52,7 +52,9 @@
</span><span class="cx"> void addData(const char* data, int length) override;
</span><span class="cx"> void finishedAddingData() override;
</span><span class="cx"> Ref<SharedBuffer> replacementData() const override;
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> ContentFilterUnblockHandler unblockHandler() const override;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static bool enabled();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaNetworkExtensionContentFiltermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -196,6 +196,7 @@
</span><span class="cx"> return SharedBuffer::wrapNSData(m_replacementData.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> ContentFilterUnblockHandler NetworkExtensionContentFilter::unblockHandler() const
</span><span class="cx"> {
</span><span class="cx"> #if HAVE(MODERN_NE_FILTER_SOURCE)
</span><span class="lines">@@ -214,6 +215,7 @@
</span><span class="cx"> return { };
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void NetworkExtensionContentFilter::handleDecision(NEFilterSourceStatus status, NSData *replacementData)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaParentalControlsContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.h 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -46,8 +46,9 @@
</span><span class="cx"> void addData(const char* data, int length) override;
</span><span class="cx"> void finishedAddingData() override;
</span><span class="cx"> Ref<SharedBuffer> replacementData() const override;
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> ContentFilterUnblockHandler unblockHandler() const override;
</span><del>-
</del><ins>+#endif
</ins><span class="cx"> private:
</span><span class="cx"> static bool enabled();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaParentalControlsContentFiltermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> return SharedBuffer::wrapNSData(m_replacementData.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> ContentFilterUnblockHandler ParentalControlsContentFilter::unblockHandler() const
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -104,6 +105,7 @@
</span><span class="cx"> return { };
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void ParentalControlsContentFilter::updateFilterState()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockContentFilter.h (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockContentFilter.h 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebCore/testing/MockContentFilter.h 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -43,7 +43,9 @@
</span><span class="cx"> void addData(const char* data, int length) override;
</span><span class="cx"> void finishedAddingData() override;
</span><span class="cx"> Ref<SharedBuffer> replacementData() const override;
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> ContentFilterUnblockHandler unblockHandler() const override;
</span><ins>+#endif
</ins><span class="cx"> String unblockRequestDeniedScript() const override;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-02 Enrica Casucci <enrica@apple.com>
+
+ Allow building with content filtering disabled.
+ https://bugs.webkit.org/show_bug.cgi?id=160454
+
+ Reviewed by Simon Fraser.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::blockedByContentFilterError):
+
</ins><span class="cx"> 2016-08-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove more unused/uninstalled Objective-C DOM bindings
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -51,7 +51,9 @@
</span><span class="cx"> ENABLE_CANVAS_PROXY = ;
</span><span class="cx"> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
</span><span class="cx"> ENABLE_ES6_MODULES = ;
</span><del>-ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
</del><ins>+ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
+ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
</ins><span class="cx"> ENABLE_CSP_NEXT = ;
</span><span class="cx"> ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
</span><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -162,7 +162,9 @@
</span><span class="cx"> WebCore::ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest&) override;
</span><span class="cx"> WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&) override;
</span><span class="cx"> WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&) override;
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> WebCore::ResourceError blockedByContentFilterError(const WebCore::ResourceRequest&) override;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&) override;
</span><span class="cx"> WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -1148,10 +1148,12 @@
</span><span class="cx"> return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorFrameLoadInterruptedByPolicyChange URL:request.url()];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> ResourceError WebFrameLoaderClient::blockedByContentFilterError(const ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorFrameLoadBlockedByContentFilter URL:request.url()];
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> ResourceError WebFrameLoaderClient::cannotShowMIMETypeError(const ResourceResponse& response)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-02 Enrica Casucci <enrica@apple.com>
+
+ Allow building with content filtering disabled.
+ https://bugs.webkit.org/show_bug.cgi?id=160454
+
+ Reviewed by Simon Fraser.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (IPC::ArgumentCoder<KeypressCommand>::decode):
+ (IPC::ArgumentCoder<ContentFilterUnblockHandler>::encode):
+ (IPC::ArgumentCoder<ContentFilterUnblockHandler>::decode):
+ * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
+ (WebKit::blockedByContentFilterError):
+
</ins><span class="cx"> 2016-08-02 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor data passed along for a "GetRecord" request.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -51,7 +51,9 @@
</span><span class="cx"> ENABLE_CANVAS_PROXY = ;
</span><span class="cx"> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
</span><span class="cx"> ENABLE_ES6_MODULES = ;
</span><del>-ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
</del><ins>+ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
+ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
</ins><span class="cx"> ENABLE_CSP_NEXT = ;
</span><span class="cx"> ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
</span><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -475,6 +475,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> void ArgumentCoder<ContentFilterUnblockHandler>::encode(ArgumentEncoder& encoder, const ContentFilterUnblockHandler& contentFilterUnblockHandler)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSMutableData> data = adoptNS([[NSMutableData alloc] init]);
</span><span class="lines">@@ -499,6 +500,7 @@
</span><span class="cx"> [unarchiver finishDecoding];
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -82,10 +82,12 @@
</span><span class="cx"> return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> ResourceError blockedByContentFilterError(const ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentFilter, request.url(), WEB_UI_STRING("The URL was blocked by a content filter", "WebKitErrorBlockedByContentFilter"));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Tools/ChangeLog 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-02 Enrica Casucci <enrica@apple.com>
+
+ Allow building with content filtering disabled.
+ https://bugs.webkit.org/show_bug.cgi?id=160454
+
+ Reviewed by Simon Fraser.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-08-02 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Removing IndexedDB WebsiteData can fail for some users.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (204052 => 204053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-08-02 23:43:30 UTC (rev 204052)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-08-03 00:00:59 UTC (rev 204053)
</span><span class="lines">@@ -51,7 +51,9 @@
</span><span class="cx"> ENABLE_CANVAS_PROXY = ;
</span><span class="cx"> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
</span><span class="cx"> ENABLE_ES6_MODULES = ;
</span><del>-ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
</del><ins>+ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
+ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
+ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
</ins><span class="cx"> ENABLE_CSP_NEXT = ;
</span><span class="cx"> ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
</span><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span></span></pre>
</div>
</div>
</body>
</html>