Title: [203435] trunk
- Revision
- 203435
- Author
- [email protected]
- Date
- 2016-07-19 17:09:52 -0700 (Tue, 19 Jul 2016)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (203434 => 203435)
--- 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)
@@ -1,3 +1,13 @@
+2016-07-19 Andy Estes <[email protected]>
+
+ 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.
+
2016-07-18 Anders Carlsson <[email protected]>
WebKit nightly fails to build on macOS Sierra
Modified: trunk/Source/WebKit/mac/Misc/WebKitErrors.h (203434 => 203435)
--- 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)
@@ -38,13 +38,11 @@
@constant WebKitErrorCannotShowMIMEType
@constant WebKitErrorCannotShowURL
@constant WebKitErrorFrameLoadInterruptedByPolicyChange
- @constant WebKitErrorFrameLoadBlockedByContentFilter
*/
enum {
WebKitErrorCannotShowMIMEType = 100,
WebKitErrorCannotShowURL = 101,
WebKitErrorFrameLoadInterruptedByPolicyChange = 102,
- WebKitErrorFrameLoadBlockedByContentFilter = 105,
};
/*!
Modified: trunk/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h (203434 => 203435)
--- 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)
@@ -36,9 +36,11 @@
@enum
@abstract Policy errors - Pending Public API Review
@constant WebKitErrorCannotUseRestrictedPort
+ @constant WebKitErrorFrameLoadBlockedByContentFilter
*/
enum {
WebKitErrorCannotUseRestrictedPort = 103,
+ WebKitErrorFrameLoadBlockedByContentFilter = 105,
};
/*!
Modified: trunk/Tools/ChangeLog (203434 => 203435)
--- trunk/Tools/ChangeLog 2016-07-19 23:38:26 UTC (rev 203434)
+++ trunk/Tools/ChangeLog 2016-07-20 00:09:52 UTC (rev 203435)
@@ -1,3 +1,15 @@
+2016-07-19 Andy Estes <[email protected]>
+
+ 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.
+
2016-07-19 Alex Christensen <[email protected]>
Add regression test for r203392
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm (203434 => 203435)
--- 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)
@@ -32,6 +32,7 @@
#import "PlatformUtilities.h"
#import "TestProtocol.h"
#import "WKWebViewConfigurationExtras.h"
+#import <WebKit/WKErrorRef.h>
#import <WebKit/WKNavigationDelegatePrivate.h>
#import <WebKit/WKProcessPoolPrivate.h>
#import <WebKit/WKWebView.h>
@@ -265,7 +266,7 @@
- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
{
EXPECT_WK_STREQ(WebKitErrorDomain, error.domain);
- EXPECT_EQ(WebKitErrorFrameLoadBlockedByContentFilter, error.code);
+ EXPECT_EQ(kWKErrorCodeFrameLoadBlockedByContentFilter, error.code);
[webView _loadAlternateHTMLString:@"FAIL" baseURL:nil forUnreachableURL:[error.userInfo objectForKey:NSURLErrorFailingURLErrorKey]];
}
Modified: trunk/Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm (203434 => 203435)
--- 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)
@@ -29,6 +29,7 @@
#import "PlatformUtilities.h"
#import "TestProtocol.h"
#import <WebKit/WebKit.h>
+#import <WebKit/WebKitErrorsPrivate.h>
using Decision = WebCore::MockContentFilterSettings::Decision;
using DecisionPoint = WebCore::MockContentFilterSettings::DecisionPoint;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
