<!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>[203435] 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/203435">203435</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2016-07-19 17:09:52 -0700 (Tue, 19 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move WebKitErrorFrameLoadBlockedByContentFilter from WebKitErrors.h to WebKitErrorsPrivate.h
https://bugs.webkit.org/show_bug.cgi?id=159956
Reviewed by Dan Bernstein.
Source/WebKit/mac:
* Misc/WebKitErrors.h: Moved definition of WebKitErrorFrameLoadBlockedByContentFilter from here ...
* Misc/WebKitErrorsPrivate.h: to here.
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm: Included WKErrorRef.h.
(-[LoadAlternateNavigationDelegate webView:didFailProvisionalNavigation:withError:]):
Used kWKErrorCodeFrameLoadBlockedByContentFilter instead of WebKitErrorFrameLoadBlockedByContentFilter.
* TestWebKitAPI/Tests/mac/ContentFiltering.mm: Included WebKitErrorsPrivate.h instead of WebKitErrors.h.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitErrorsh">trunk/Source/WebKit/mac/Misc/WebKitErrors.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitErrorsPrivateh">trunk/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaContentFilteringmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacContentFilteringmm">trunk/Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (203434 => 203435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-07-19 23:38:26 UTC (rev 203434)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-20 00:09:52 UTC (rev 203435)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-19 Andy Estes <aestes@apple.com>
+
+ Move WebKitErrorFrameLoadBlockedByContentFilter from WebKitErrors.h to WebKitErrorsPrivate.h
+ https://bugs.webkit.org/show_bug.cgi?id=159956
+
+ Reviewed by Dan Bernstein.
+
+ * Misc/WebKitErrors.h: Moved definition of WebKitErrorFrameLoadBlockedByContentFilter from here ...
+ * Misc/WebKitErrorsPrivate.h: to here.
+
</ins><span class="cx"> 2016-07-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit nightly fails to build on macOS Sierra
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitErrorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitErrors.h (203434 => 203435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitErrors.h 2016-07-19 23:38:26 UTC (rev 203434)
+++ trunk/Source/WebKit/mac/Misc/WebKitErrors.h 2016-07-20 00:09:52 UTC (rev 203435)
</span><span class="lines">@@ -38,13 +38,11 @@
</span><span class="cx"> @constant WebKitErrorCannotShowMIMEType
</span><span class="cx"> @constant WebKitErrorCannotShowURL
</span><span class="cx"> @constant WebKitErrorFrameLoadInterruptedByPolicyChange
</span><del>- @constant WebKitErrorFrameLoadBlockedByContentFilter
</del><span class="cx"> */
</span><span class="cx"> enum {
</span><span class="cx"> WebKitErrorCannotShowMIMEType = 100,
</span><span class="cx"> WebKitErrorCannotShowURL = 101,
</span><span class="cx"> WebKitErrorFrameLoadInterruptedByPolicyChange = 102,
</span><del>- WebKitErrorFrameLoadBlockedByContentFilter = 105,
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*!
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitErrorsPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h (203434 => 203435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h 2016-07-19 23:38:26 UTC (rev 203434)
+++ trunk/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h 2016-07-20 00:09:52 UTC (rev 203435)
</span><span class="lines">@@ -36,9 +36,11 @@
</span><span class="cx"> @enum
</span><span class="cx"> @abstract Policy errors - Pending Public API Review
</span><span class="cx"> @constant WebKitErrorCannotUseRestrictedPort
</span><ins>+ @constant WebKitErrorFrameLoadBlockedByContentFilter
</ins><span class="cx"> */
</span><span class="cx"> enum {
</span><span class="cx"> WebKitErrorCannotUseRestrictedPort = 103,
</span><ins>+ WebKitErrorFrameLoadBlockedByContentFilter = 105,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*!
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203434 => 203435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-19 23:38:26 UTC (rev 203434)
+++ trunk/Tools/ChangeLog 2016-07-20 00:09:52 UTC (rev 203435)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-19 Andy Estes <aestes@apple.com>
+
+ Move WebKitErrorFrameLoadBlockedByContentFilter from WebKitErrors.h to WebKitErrorsPrivate.h
+ https://bugs.webkit.org/show_bug.cgi?id=159956
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm: Included WKErrorRef.h.
+ (-[LoadAlternateNavigationDelegate webView:didFailProvisionalNavigation:withError:]):
+ Used kWKErrorCodeFrameLoadBlockedByContentFilter instead of WebKitErrorFrameLoadBlockedByContentFilter.
+ * TestWebKitAPI/Tests/mac/ContentFiltering.mm: Included WebKitErrorsPrivate.h instead of WebKitErrors.h.
+
</ins><span class="cx"> 2016-07-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add regression test for r203392
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaContentFilteringmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm (203434 => 203435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm 2016-07-19 23:38:26 UTC (rev 203434)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm 2016-07-20 00:09:52 UTC (rev 203435)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "PlatformUtilities.h"
</span><span class="cx"> #import "TestProtocol.h"
</span><span class="cx"> #import "WKWebViewConfigurationExtras.h"
</span><ins>+#import <WebKit/WKErrorRef.h>
</ins><span class="cx"> #import <WebKit/WKNavigationDelegatePrivate.h>
</span><span class="cx"> #import <WebKit/WKProcessPoolPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebView.h>
</span><span class="lines">@@ -265,7 +266,7 @@
</span><span class="cx"> - (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
</span><span class="cx"> {
</span><span class="cx"> EXPECT_WK_STREQ(WebKitErrorDomain, error.domain);
</span><del>- EXPECT_EQ(WebKitErrorFrameLoadBlockedByContentFilter, error.code);
</del><ins>+ EXPECT_EQ(kWKErrorCodeFrameLoadBlockedByContentFilter, error.code);
</ins><span class="cx"> [webView _loadAlternateHTMLString:@"FAIL" baseURL:nil forUnreachableURL:[error.userInfo objectForKey:NSURLErrorFailingURLErrorKey]];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacContentFilteringmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm (203434 => 203435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm 2016-07-19 23:38:26 UTC (rev 203434)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm 2016-07-20 00:09:52 UTC (rev 203435)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import "PlatformUtilities.h"
</span><span class="cx"> #import "TestProtocol.h"
</span><span class="cx"> #import <WebKit/WebKit.h>
</span><ins>+#import <WebKit/WebKitErrorsPrivate.h>
</ins><span class="cx">
</span><span class="cx"> using Decision = WebCore::MockContentFilterSettings::Decision;
</span><span class="cx"> using DecisionPoint = WebCore::MockContentFilterSettings::DecisionPoint;
</span></span></pre>
</div>
</div>
</body>
</html>