Diff
Modified: trunk/Source/WebKit/ChangeLog (260092 => 260093)
--- trunk/Source/WebKit/ChangeLog 2020-04-14 20:23:55 UTC (rev 260092)
+++ trunk/Source/WebKit/ChangeLog 2020-04-14 20:27:25 UTC (rev 260093)
@@ -1,3 +1,24 @@
+2020-04-14 Per Arne Vollan <pvol...@apple.com>
+
+ [iOS] Content filtering needs access to the frontboard service
+ https://bugs.webkit.org/show_bug.cgi?id=210505
+
+ Reviewed by Geoffrey Garen.
+
+ Content filtering in the WebContent process needs access to the frontboard service on iOS. Issue an extension
+ to this service when content filtering is enabled.
+
+ API test: WebKit.WebFilterFeatureHasFrontboardServiceAccess
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode const):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
2020-04-14 Wenson Hsieh <wenson_hs...@apple.com>
[iPadOS] Wikipedia articles lay out incorrectly in 1/3 multitasking window
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (260092 => 260093)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-04-14 20:23:55 UTC (rev 260092)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2020-04-14 20:27:25 UTC (rev 260093)
@@ -159,6 +159,7 @@
#if PLATFORM(IOS)
encoder << compilerServiceExtensionHandle;
encoder << contentFilterExtensionHandle;
+ encoder << frontboardServiceExtensionHandle;
#endif
#if PLATFORM(IOS_FAMILY)
@@ -430,6 +431,12 @@
if (!contentFilterExtensionHandle)
return false;
parameters.contentFilterExtensionHandle = WTFMove(*contentFilterExtensionHandle);
+
+ Optional<Optional<SandboxExtension::Handle>> frontboardServiceExtensionHandle;
+ decoder >> frontboardServiceExtensionHandle;
+ if (!frontboardServiceExtensionHandle)
+ return false;
+ parameters.frontboardServiceExtensionHandle = WTFMove(*frontboardServiceExtensionHandle);
#endif
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (260092 => 260093)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2020-04-14 20:23:55 UTC (rev 260092)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2020-04-14 20:27:25 UTC (rev 260093)
@@ -199,6 +199,7 @@
#if PLATFORM(IOS)
Optional<SandboxExtension::Handle> compilerServiceExtensionHandle;
Optional<SandboxExtension::Handle> contentFilterExtensionHandle;
+ Optional<SandboxExtension::Handle> frontboardServiceExtensionHandle;
#endif
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (260092 => 260093)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-04-14 20:23:55 UTC (rev 260092)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-04-14 20:27:25 UTC (rev 260093)
@@ -420,6 +420,10 @@
SandboxExtension::Handle handle;
SandboxExtension::createHandleForMachLookup("com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI", WTF::nullopt, handle);
parameters.contentFilterExtensionHandle = WTFMove(handle);
+
+ SandboxExtension::Handle frontboardServiceExtensionHandle;
+ if (SandboxExtension::createHandleForMachLookup("com.apple.frontboard.systemappservices", WTF::nullopt, frontboardServiceExtensionHandle))
+ parameters.frontboardServiceExtensionHandle = WTFMove(frontboardServiceExtensionHandle);
}
#endif
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (260092 => 260093)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-04-14 20:23:55 UTC (rev 260092)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-04-14 20:27:25 UTC (rev 260093)
@@ -283,6 +283,9 @@
if (parameters.contentFilterExtensionHandle)
SandboxExtension::consumePermanently(*parameters.contentFilterExtensionHandle);
ParentalControlsContentFilter::setHasConsumedSandboxExtension(parameters.contentFilterExtensionHandle.hasValue());
+
+ if (parameters.frontboardServiceExtensionHandle)
+ SandboxExtension::consumePermanently(*parameters.frontboardServiceExtensionHandle);
#endif
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Tools/ChangeLog (260092 => 260093)
--- trunk/Tools/ChangeLog 2020-04-14 20:23:55 UTC (rev 260092)
+++ trunk/Tools/ChangeLog 2020-04-14 20:27:25 UTC (rev 260093)
@@ -1,3 +1,15 @@
+2020-04-14 Per Arne Vollan <pvol...@apple.com>
+
+ [iOS] Content filtering needs access to the frontboard service
+ https://bugs.webkit.org/show_bug.cgi?id=210505
+
+ Reviewed by Geoffrey Garen.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit/WebFilter.mm: Added.
+ (isManagedSessionMethodOverride):
+ (TEST):
+
2020-04-14 Andres Gonzalez <andresg...@apple.com>
Make WTR::AccessibilityUIElements calls to accessibilitySetValue run on AX secondary thread.
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (260092 => 260093)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2020-04-14 20:23:55 UTC (rev 260092)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2020-04-14 20:27:25 UTC (rev 260093)
@@ -893,6 +893,7 @@
C15CBB3023F1FF1A00300CC7 /* BacklightLevelNotification.mm in Sources */ = {isa = PBXBuildFile; fileRef = C15CBB2F23F1FF1A00300CC7 /* BacklightLevelNotification.mm */; };
C15CBB3F23FB177A00300CC7 /* PreferenceChanges.mm in Sources */ = {isa = PBXBuildFile; fileRef = C15CBB3E23FB177A00300CC7 /* PreferenceChanges.mm */; };
C1692DCA23D10DAE006E88F7 /* Battery.mm in Sources */ = {isa = PBXBuildFile; fileRef = C1692DC923D10DAE006E88F7 /* Battery.mm */; };
+ C1FF9EDB244644F000839AE4 /* WebFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = C1FF9EDA244644F000839AE4 /* WebFilter.mm */; };
C20F88A72295B96700D610FA /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C20F88A62295B96700D610FA /* CoreText.framework */; };
C22FA32B228F8708009D7988 /* TextWidth.mm in Sources */ = {isa = PBXBuildFile; fileRef = C22FA32A228F8708009D7988 /* TextWidth.mm */; };
C22FA32D228F8AEB009D7988 /* TextWidth.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C22FA32C228F877A009D7988 /* TextWidth.html */; };
@@ -2482,6 +2483,7 @@
C15CBB3E23FB177A00300CC7 /* PreferenceChanges.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PreferenceChanges.mm; sourceTree = "<group>"; };
C1692DC923D10DAE006E88F7 /* Battery.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Battery.mm; sourceTree = "<group>"; };
C1D8EE212028E8E3008EB141 /* WebProcessTerminate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessTerminate.mm; sourceTree = "<group>"; };
+ C1FF9EDA244644F000839AE4 /* WebFilter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFilter.mm; sourceTree = "<group>"; };
C20F88A62295B96700D610FA /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
C22FA32A228F8708009D7988 /* TextWidth.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TextWidth.mm; sourceTree = "<group>"; };
C22FA32C228F877A009D7988 /* TextWidth.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = TextWidth.html; sourceTree = "<group>"; };
@@ -2945,6 +2947,7 @@
C15CBB3E23FB177A00300CC7 /* PreferenceChanges.mm */,
C149D54F242E9844003EBB12 /* SleepDisabler.mm */,
0F139E751A423A5300F590F5 /* WeakObjCPtr.mm */,
+ C1FF9EDA244644F000839AE4 /* WebFilter.mm */,
);
name = cocoa;
sourceTree = "<group>";
@@ -5167,6 +5170,7 @@
830F2E0C209A6A8E00D36FF1 /* WebContentProcessDidTerminate.mm in Sources */,
7C83E04C1D0A641800FEBCF3 /* WebCoreNSURLSession.mm in Sources */,
57A79857224AB34E00A7F6F1 /* WebCryptoMasterKey.mm in Sources */,
+ C1FF9EDB244644F000839AE4 /* WebFilter.mm in Sources */,
5C973F5C1F58EF8B00359C27 /* WebGLPolicy.mm in Sources */,
7CCE7EAB1A411A2400447C4C /* WebKitAgnosticTest.mm in Sources */,
51714EB81CF8CA17004723C4 /* WebProcessKillIDBCleanup.mm in Sources */,
Added: trunk/Tools/TestWebKitAPI/Tests/WebKit/WebFilter.mm (0 => 260093)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WebFilter.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WebFilter.mm 2020-04-14 20:27:25 UTC (rev 260093)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#import "PlatformUtilities.h"
+#import "TestWKWebView.h"
+#import <WebKit/WKProcessPoolPrivate.h>
+#import <WebKit/_WKProcessPoolConfiguration.h>
+
+#if PLATFORM(IOS_FAMILY) && WK_HAVE_C_SPI
+
+#import <pal/spi/cocoa/WebFilterEvaluatorSPI.h>
+#import <wtf/SoftLinking.h>
+
+SOFT_LINK_PRIVATE_FRAMEWORK(WebContentAnalysis);
+SOFT_LINK_CLASS(WebContentAnalysis, WebFilterEvaluator);
+
+static IMP isManagedSessionMethodOriginal = nil;
+
+static BOOL isManagedSessionMethodOverride(id self, SEL selector)
+{
+ return YES;
+}
+
+TEST(WebKit, WebFilterFeatureHasFrontboardServiceAccess)
+{
+ Method isManagedSessionMethod = class_getClassMethod(getWebFilterEvaluatorClass(), @selector(isManagedSession));
+ ASSERT(isManagedSessionMethod);
+ isManagedSessionMethodOriginal = method_setImplementation(isManagedSessionMethod, (IMP)isManagedSessionMethodOverride);
+ ASSERT(isManagedSessionMethodOriginal);
+
+ auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+ WKRetainPtr<WKContextRef> context = adoptWK(TestWebKitAPI::Util::createContextForInjectedBundleTest("InternalsInjectedBundleTest"));
+ configuration.get().processPool = (WKProcessPool *)context.get();
+ auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration.get() addToWindow:YES]);
+
+ [webView synchronouslyLoadTestPageNamed:@"simple"];
+
+ auto sandboxAccess = [&] {
+ return [webView stringByEvaluatingJavaScript:@"window.internals.hasSandboxMachLookupAccessToGlobalName('com.apple.WebKit.WebContent', 'com.apple.frontboard.systemappservices')"].boolValue;
+ };
+
+ ASSERT_TRUE(sandboxAccess());
+}
+
+#endif
