Diff
Modified: trunk/Source/WebKit/ChangeLog (291022 => 291023)
--- trunk/Source/WebKit/ChangeLog 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Source/WebKit/ChangeLog 2022-03-09 01:58:01 UTC (rev 291023)
@@ -1,3 +1,25 @@
+2022-03-08 Alex Christensen <[email protected]>
+
+ Remove unused _grantAccessToPreferenceService
+ https://bugs.webkit.org/show_bug.cgi?id=237623
+
+ Reviewed by Per Arne Vollan.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _grantAccessToPreferenceService]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ (WebKit::WebPageProxy::grantAccessToPreferenceService): Deleted.
+ * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+ (WebKit::WebProcessProxy::unblockPreferenceServiceIfNeeded): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.h:
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::notifyPreferencesChanged):
+ (WebKit::WebProcess::unblockPreferenceService): Deleted.
+
2022-03-08 Wenson Hsieh <[email protected]>
Rename TextRecognitionUtilities.* to ImageAnalysisUtilities.*
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (291022 => 291023)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2022-03-09 01:58:01 UTC (rev 291023)
@@ -3574,13 +3574,6 @@
#endif
}
-- (void)_grantAccessToPreferenceService
-{
- THROW_IF_SUSPENDED;
- if (_page)
- _page->grantAccessToPreferenceService();
-}
-
#pragma mark - scrollPerformanceData
- (void)_setScrollPerformanceDataCollectionEnabled:(BOOL)enabled
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (291022 => 291023)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2022-03-09 01:58:01 UTC (rev 291023)
@@ -366,8 +366,6 @@
- (void)_getProcessDisplayNameWithCompletionHandler:(void (^)(NSString *))completionHandler WK_API_AVAILABLE(macos(11.0), ios(14.0));
-- (void)_grantAccessToPreferenceService WK_API_AVAILABLE(macos(11.0), ios(14.0));
-
- (void)_serviceWorkersEnabled:(void(^)(BOOL))completionHandler WK_API_AVAILABLE(macos(11.0), ios(14.0));
- (void)_clearServiceWorkerEntitlementOverride:(void (^)(void))completionHandler WK_API_AVAILABLE(macos(11.0), ios(14.0));
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm (291022 => 291023)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2022-03-09 01:58:01 UTC (rev 291023)
@@ -478,13 +478,6 @@
#endif // ENABLE(GPU_PROCESS)
#endif // HAVE(VISIBILITY_PROPAGATION_VIEW)
-void WebPageProxy::grantAccessToPreferenceService()
-{
-#if ENABLE(CFPREFS_DIRECT_MODE)
- process().unblockPreferenceServiceIfNeeded();
-#endif
-}
-
#if ENABLE(MEDIA_USAGE)
MediaUsageManager& WebPageProxy::mediaUsageManager()
{
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (291022 => 291023)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2022-03-09 01:58:01 UTC (rev 291023)
@@ -255,24 +255,6 @@
m_hasSentMessageToUnblockAccessibilityServer = true;
}
-#if ENABLE(CFPREFS_DIRECT_MODE)
-void WebProcessProxy::unblockPreferenceServiceIfNeeded()
-{
- if (m_hasSentMessageToUnblockPreferenceService)
- return;
- if (!processIdentifier())
- return;
- if (!canSendMessage())
- return;
-
- auto handleArray = SandboxExtension::createHandlesForMachLookup({ "com.apple.cfprefsd.agent"_s, "com.apple.cfprefsd.daemon"_s }, connection() ? connection()->getAuditToken() : std::nullopt);
- ASSERT(handleArray.size() == 2);
-
- send(Messages::WebProcess::UnblockPreferenceService(WTFMove(handleArray)), 0);
- m_hasSentMessageToUnblockPreferenceService = true;
-}
-#endif
-
Vector<String> WebProcessProxy::platformOverrideLanguages() const
{
static const NeverDestroyed<Vector<String>> overrideLanguages = makeVector<String>([[NSUserDefaults standardUserDefaults] valueForKey:@"AppleLanguages"]);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (291022 => 291023)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2022-03-09 01:58:01 UTC (rev 291023)
@@ -1905,10 +1905,6 @@
void revokeAccessToAssetServices();
void switchFromStaticFontRegistryToUserFontRegistry();
-#if PLATFORM(COCOA)
- void grantAccessToPreferenceService();
-#endif
-
void setIsTakingSnapshotsForApplicationSuspension(bool);
void setNeedsDOMWindowResizeEvent();
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.h (291022 => 291023)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2022-03-09 01:58:01 UTC (rev 291023)
@@ -357,10 +357,7 @@
#if PLATFORM(COCOA)
void unblockAccessibilityServerIfNeeded();
-#if ENABLE(CFPREFS_DIRECT_MODE)
- void unblockPreferenceServiceIfNeeded();
#endif
-#endif
void updateAudibleMediaAssertions();
@@ -602,7 +599,6 @@
#if PLATFORM(COCOA)
bool m_hasSentMessageToUnblockAccessibilityServer { false };
- bool m_hasSentMessageToUnblockPreferenceService { false };
#endif
HashMap<String, uint64_t> m_pageURLRetainCountMap;
Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (291022 => 291023)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2022-03-09 01:58:01 UTC (rev 291023)
@@ -353,7 +353,6 @@
void unblockServicesRequiredByAccessibility(const Vector<SandboxExtension::Handle>&);
#if ENABLE(CFPREFS_DIRECT_MODE)
void notifyPreferencesChanged(const String& domain, const String& key, const std::optional<String>& encodedValue);
- void unblockPreferenceService(Vector<SandboxExtension::Handle>&&);
#endif
void powerSourceDidChange(bool);
#endif
Modified: trunk/Source/WebKit/WebProcess/WebProcess.messages.in (291022 => 291023)
--- trunk/Source/WebKit/WebProcess/WebProcess.messages.in 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Source/WebKit/WebProcess/WebProcess.messages.in 2022-03-09 01:58:01 UTC (rev 291023)
@@ -173,7 +173,6 @@
UnblockServicesRequiredByAccessibility(Vector<WebKit::SandboxExtension::Handle> handleArray)
#if ENABLE(CFPREFS_DIRECT_MODE)
NotifyPreferencesChanged(String domain, String key, std::optional<String> encodedValue)
- UnblockPreferenceService(Vector<WebKit::SandboxExtension::Handle> handleArray)
#endif
PowerSourceDidChange(bool hasAC)
#endif
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (291022 => 291023)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2022-03-09 01:58:01 UTC (rev 291023)
@@ -1148,12 +1148,6 @@
{
preferenceDidUpdate(domain, key, encodedValue);
}
-
-void WebProcess::unblockPreferenceService(Vector<SandboxExtension::Handle>&& handleArray)
-{
- SandboxExtension::consumePermanently(handleArray);
- _CFPrefsSetDirectModeEnabled(false);
-}
#endif
void WebProcess::grantAccessToAssetServices(WebKit::SandboxExtension::Handle&& mobileAssetV2Handle)
Modified: trunk/Tools/ChangeLog (291022 => 291023)
--- trunk/Tools/ChangeLog 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Tools/ChangeLog 2022-03-09 01:58:01 UTC (rev 291023)
@@ -1,3 +1,13 @@
+2022-03-08 Alex Christensen <[email protected]>
+
+ Remove unused _grantAccessToPreferenceService
+ https://bugs.webkit.org/show_bug.cgi?id=237623
+
+ Reviewed by Per Arne Vollan.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit/GrantAccessToPreferencesService.mm: Removed.
+
2022-03-08 Chris Dumez <[email protected]>
Rename allow-custom-protocols-navigation to allow-top-navigation-to-custom-protocols
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (291022 => 291023)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2022-03-09 01:58:01 UTC (rev 291023)
@@ -989,7 +989,6 @@
E324A6F02041C82000A76593 /* UniqueArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E398BC0F2041C76300387136 /* UniqueArray.cpp */; };
E325C90723E3870200BC7D3B /* PictureInPictureSupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = E325C90623E3870200BC7D3B /* PictureInPictureSupport.mm */; };
E32B549222810AC4008AD702 /* Packed.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E32B549122810AC0008AD702 /* Packed.cpp */; };
- E34A6D192412DE390012AB6E /* GrantAccessToPreferencesService.mm in Sources */ = {isa = PBXBuildFile; fileRef = E34A6D182412DE390012AB6E /* GrantAccessToPreferencesService.mm */; };
E355A63026157174001C1129 /* RobinHoodHashSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E355A62F26157174001C1129 /* RobinHoodHashSet.cpp */; };
E355A6322615718F001C1129 /* RobinHoodHashMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E355A6312615718F001C1129 /* RobinHoodHashMap.cpp */; };
E35B908223F60DD0000011FF /* LocalizedDeviceModel.mm in Sources */ = {isa = PBXBuildFile; fileRef = E35B908123F60DD0000011FF /* LocalizedDeviceModel.mm */; };
@@ -2973,7 +2972,6 @@
E3210518261979F300157C67 /* FixedVector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FixedVector.cpp; sourceTree = "<group>"; };
E325C90623E3870200BC7D3B /* PictureInPictureSupport.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureInPictureSupport.mm; sourceTree = "<group>"; };
E32B549122810AC0008AD702 /* Packed.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Packed.cpp; sourceTree = "<group>"; };
- E34A6D182412DE390012AB6E /* GrantAccessToPreferencesService.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GrantAccessToPreferencesService.mm; sourceTree = "<group>"; };
E355A62F26157174001C1129 /* RobinHoodHashSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RobinHoodHashSet.cpp; sourceTree = "<group>"; };
E355A6312615718F001C1129 /* RobinHoodHashMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RobinHoodHashMap.cpp; sourceTree = "<group>"; };
E35B908123F60DD0000011FF /* LocalizedDeviceModel.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalizedDeviceModel.mm; sourceTree = "<group>"; };
@@ -3386,7 +3384,6 @@
C13D82D82416F13200A62793 /* EnableAccessibility.mm */,
1C81802625FB09E200608B3E /* FontRegistrySandboxCheck.mm */,
E394AE6E23F2303E005B4936 /* GrantAccessToMobileAssets.mm */,
- E34A6D182412DE390012AB6E /* GrantAccessToPreferencesService.mm */,
F460F656261116EA0064F2B6 /* InjectedBundleHitTest.mm */,
E35B908123F60DD0000011FF /* LocalizedDeviceModel.mm */,
1CF087D725ED7F73004148CB /* MobileAssetSandboxCheck.mm */,
@@ -5654,7 +5651,6 @@
07E499911F9E56DF002F1EF3 /* GetUserMediaReprompt.mm in Sources */,
510A921424D615B400BFD89C /* GoogleStadia.mm in Sources */,
E394AE6F23F2303E005B4936 /* GrantAccessToMobileAssets.mm in Sources */,
- E34A6D192412DE390012AB6E /* GrantAccessToPreferencesService.mm in Sources */,
2D09CF0026A68297009C43C0 /* GraphicsContextTestsCG.cpp in Sources */,
8E4A85371E1D1AB200F53B0F /* GridPosition.cpp in Sources */,
51EB125924C68592000CB030 /* HIDGamepads.mm in Sources */,
Deleted: trunk/Tools/TestWebKitAPI/Tests/WebKit/GrantAccessToPreferencesService.mm (291022 => 291023)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/GrantAccessToPreferencesService.mm 2022-03-09 01:17:14 UTC (rev 291022)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/GrantAccessToPreferencesService.mm 2022-03-09 01:58:01 UTC (rev 291023)
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-
-#import "config.h"
-
-#if WK_HAVE_C_SPI
-
-#import "PlatformUtilities.h"
-#import "TestWKWebView.h"
-#import <WebKit/WKWebViewPrivate.h>
-
-TEST(WebKit, GrantAccessPreferencesService)
-{
- 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"];
-
- [webView _grantAccessToPreferenceService];
-
- auto sandboxAccess = [&] {
- return [webView stringByEvaluatingJavaScript:@"window.internals.hasSandboxMachLookupAccessToGlobalName('com.apple.WebKit.WebContent', 'com.apple.cfprefsd.daemon')"].boolValue;
- };
-
-#if ENABLE(CFPREFS_DIRECT_MODE)
- ASSERT_FALSE(sandboxAccess());
-#else
- ASSERT_TRUE(sandboxAccess());
-#endif
-}
-
-#endif
