Changeset 203435 in webkit

Timestamp:

Jul 19, 2016, 5:09:52 PM (10 years ago)

Author:

aestes@apple.com

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.

Location:

trunk

Files:

• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/Misc/WebKitErrors.h (modified) (2 diffs)
• Source/WebKit/mac/Misc/WebKitErrorsPrivate.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm (modified) (2 diffs)
• Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+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.
+
 2016-07-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/Misc/WebKitErrors.h

@@ -39 +39 @@
     @constant WebKitErrorCannotShowURL
     @constant WebKitErrorFrameLoadInterruptedByPolicyChange
-    @constant WebKitErrorFrameLoadBlockedByContentFilter
 */
 enum {
@@ -45 +44 @@
     WebKitErrorCannotShowURL =                                  101,
     WebKitErrorFrameLoadInterruptedByPolicyChange =             102,
-    WebKitErrorFrameLoadBlockedByContentFilter =                105,
 };
 

trunk/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h

@@ -37 +37 @@
     @abstract Policy errors - Pending Public API Review
     @constant WebKitErrorCannotUseRestrictedPort
+    @constant WebKitErrorFrameLoadBlockedByContentFilter
 */
 enum {
     WebKitErrorCannotUseRestrictedPort =                        103,
+    WebKitErrorFrameLoadBlockedByContentFilter =                105,
 };
 

trunk/Tools/ChangeLog

@@ +1 @@
+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.
+
 2016-07-19  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm

@@ -33 +33 @@
 #import "TestProtocol.h"
 #import "WKWebViewConfigurationExtras.h"
+#import <WebKit/WKErrorRef.h>
 #import <WebKit/WKNavigationDelegatePrivate.h>
 #import <WebKit/WKProcessPoolPrivate.h>
@@ -266 +267 @@
 {
     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]];
 }

trunk/Tools/TestWebKitAPI/Tests/mac/ContentFiltering.mm

@@ -30 +30 @@
 #import "TestProtocol.h"
 #import <WebKit/WebKit.h>
+#import <WebKit/WebKitErrorsPrivate.h>
 
 using Decision = WebCore::MockContentFilterSettings::Decision;