Changeset 253355 in webkit

Timestamp:

Dec 10, 2019 5:19:00 PM (4 years ago)

Author:

pvollan@apple.com

Message:

Fix API test failure after r253351
​https://bugs.webkit.org/show_bug.cgi?id=205089

Reviewed by Brent Fulgham.

With the patch landed in r253351, the NetworkExtension framework will not be loaded in the WebContent process unless
[NEFilterSource filterRequired] returns YES. Swizzle this method to return YES in the UI process.

• TestWebKitAPI/Tests/WebKitCocoa/ContentFiltering.mm:

(filterRequired):
(TEST):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/ContentFiltering.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-12-10  Per Arne Vollan  <pvollan@apple.com>
+
+        Fix API test failure after r253351
+        https://bugs.webkit.org/show_bug.cgi?id=205089
+
+        Reviewed by Brent Fulgham.
+
+        With the patch landed in r253351, the NetworkExtension framework will not be loaded in the WebContent process unless
+        [NEFilterSource filterRequired] returns YES. Swizzle this method to return YES in the UI process.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/ContentFiltering.mm:
+        (filterRequired):
+        (TEST):
+
 2019-12-10  Chris Dumez  <cdumez@apple.com>
 

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

@@ -39 +39 @@
 #import <WebKit/_WKRemoteObjectInterface.h>
 #import <WebKit/_WKRemoteObjectRegistry.h>
+#import <pal/spi/cocoa/NEFilterSourceSPI.h>
 #import <wtf/RetainPtr.h>
+#import <wtf/SoftLinking.h>
+
+SOFT_LINK_FRAMEWORK_OPTIONAL(NetworkExtension);
+SOFT_LINK_CLASS_OPTIONAL(NetworkExtension, NEFilterSource);
 
 using Decision = WebCore::MockContentFilterSettings::Decision;
@@ -376 +381 @@
 @end
 
+static BOOL filterRequired(id self, SEL _cmd)
+{
+    return YES;
+}
+
 TEST(ContentFiltering, LazilyLoadPlatformFrameworks)
 {
+    // Swizzle [NEFilterSource filterRequired] to return YES in the UI process since NetworkExtension will not be loaded otherwise.
+    Method method = class_getClassMethod(getNEFilterSourceClass(), @selector(filterRequired));
+    method_setImplementation(method, reinterpret_cast<IMP>(filterRequired));
+
     @autoreleasepool {
         auto controller = adoptNS([[LazilyLoadPlatformFrameworksController alloc] init]);