Diff
Modified: trunk/Source/WebKit/ChangeLog (254993 => 254994)
--- trunk/Source/WebKit/ChangeLog 2020-01-23 19:50:05 UTC (rev 254993)
+++ trunk/Source/WebKit/ChangeLog 2020-01-23 19:56:38 UTC (rev 254994)
@@ -1,3 +1,16 @@
+2020-01-23 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r254990.
+
+ Breaks watchOS / tvOS builds.
+
+ Reverted changeset:
+
+ "[iOS] Make it possible for WebKit clients to enable
+ connections to asset services in the WebContent process"
+ https://bugs.webkit.org/show_bug.cgi?id=206551
+ https://trac.webkit.org/changeset/254990
+
2020-01-23 Brent Fulgham <[email protected]>
[iOS] Unreviewed follow-up sandbox fix.
Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (254993 => 254994)
--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-01-23 19:50:05 UTC (rev 254993)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2020-01-23 19:56:38 UTC (rev 254994)
@@ -935,7 +935,7 @@
(allow mach-lookup
(require-all
(extension "com.apple.webkit.extension.mach")
- (global-name "com.apple.iphone.axserver-systemwide" "com.apple.tccd" "com.apple.nehelper" "com.apple.nesessionmanager.content-filter" "com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI" "com.apple.diagnosticd" "com.apple.lsd.open" "com.apple.mobileassetd" "com.apple.mobileassetd.v2")))
+ (global-name "com.apple.iphone.axserver-systemwide" "com.apple.tccd" "com.apple.nehelper" "com.apple.nesessionmanager.content-filter" "com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI" "com.apple.diagnosticd" "com.apple.lsd.open")))
(allow mach-lookup
(require-all
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (254993 => 254994)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2020-01-23 19:50:05 UTC (rev 254993)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2020-01-23 19:56:38 UTC (rev 254994)
@@ -487,9 +487,6 @@
- (UIView *)_fullScreenPlaceholderView WK_API_AVAILABLE(ios(12.0));
-- (void)_grantAccessToAssetServices WK_API_AVAILABLE(ios(WK_IOS_TBA));
-- (void)_revokeAccessToAssetServices WK_API_AVAILABLE(ios(WK_IOS_TBA));
-
@end
@interface WKWebView () <UIResponderStandardEditActions>
Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (254993 => 254994)
--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2020-01-23 19:50:05 UTC (rev 254993)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2020-01-23 19:56:38 UTC (rev 254994)
@@ -3067,18 +3067,6 @@
return nil;
}
-- (void)_grantAccessToAssetServices
-{
- if (_page)
- _page->grantAccessToAssetServices();
-}
-
-- (void)_revokeAccessToAssetServices
-{
- if (_page)
- _page->revokeAccessToAssetServices();
-}
-
@end // WKWebView (WKPrivateIOS)
#if ENABLE(FULLSCREEN_API)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (254993 => 254994)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2020-01-23 19:50:05 UTC (rev 254993)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2020-01-23 19:56:38 UTC (rev 254994)
@@ -1668,11 +1668,6 @@
bool hasQueuedKeyEvent() const;
const NativeWebKeyboardEvent& firstQueuedKeyEvent() const;
-#if PLATFORM(IOS)
- void grantAccessToAssetServices();
- void revokeAccessToAssetServices();
-#endif
-
private:
WebPageProxy(PageClient&, WebProcessProxy&, Ref<API::PageConfiguration>&&);
void platformInitialize();
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (254993 => 254994)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-01-23 19:50:05 UTC (rev 254993)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-01-23 19:56:38 UTC (rev 254994)
@@ -58,7 +58,6 @@
#import "WebAutocorrectionContext.h"
#import "WebAutocorrectionData.h"
#import "WebPageMessages.h"
-#import "WebProcessMessages.h"
#import "WebProcessPool.h"
#import "WebProcessProxy.h"
#import <WebCore/FrameView.h>
@@ -1500,21 +1499,6 @@
return WebContentMode::Desktop;
}
-#if PLATFORM(IOS)
-void WebPageProxy::grantAccessToAssetServices()
-{
- SandboxExtension::Handle mobileAssetHandle, mobileAssetHandleV2;
- SandboxExtension::createHandleForMachLookup("com.apple.mobileassetd", WTF::nullopt, mobileAssetHandle);
- SandboxExtension::createHandleForMachLookup("com.apple.mobileassetd.v2", WTF::nullopt, mobileAssetHandle);
- process().send(Messages::WebProcess::GrantAccessToAssetServices(mobileAssetHandle, mobileAssetHandleV2), 0);
-}
-
-void WebPageProxy::revokeAccessToAssetServices()
-{
- process().send(Messages::WebProcess::RevokeAccessToAssetServices(), 0);
-}
-#endif
-
} // namespace WebKit
#undef RELEASE_LOG_IF_ALLOWED
Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (254993 => 254994)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2020-01-23 19:50:05 UTC (rev 254993)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2020-01-23 19:56:38 UTC (rev 254994)
@@ -309,11 +309,6 @@
bool removeServiceWorkerRegistration(WebCore::ServiceWorkerRegistrationIdentifier);
#endif
-#if PLATFORM(IOS)
- void grantAccessToAssetServices(WebKit::SandboxExtension::Handle&& mobileAssetHandle, WebKit::SandboxExtension::Handle&& mobileAssetV2Handle);
- void revokeAccessToAssetServices();
-#endif
-
private:
WebProcess();
~WebProcess();
@@ -622,11 +617,6 @@
#if ENABLE(RESOURCE_LOAD_STATISTICS)
WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
#endif
-
-#if PLATFORM(IOS)
- RefPtr<SandboxExtension> m_assetServiceExtension;
- RefPtr<SandboxExtension> m_assetServiceV2Extension;
-#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/WebProcess.messages.in (254993 => 254994)
--- trunk/Source/WebKit/WebProcess/WebProcess.messages.in 2020-01-23 19:50:05 UTC (rev 254993)
+++ trunk/Source/WebKit/WebProcess/WebProcess.messages.in 2020-01-23 19:56:38 UTC (rev 254994)
@@ -164,9 +164,4 @@
SeedResourceLoadStatisticsForTesting(WebCore::RegistrableDomain firstPartyDomain, WebCore::RegistrableDomain thirdPartyDomain, bool shouldScheduleNotification) -> () Async
SetShouldBlockThirdPartyCookiesForTesting(enum:uint8_t WebCore::ThirdPartyCookieBlockingMode blockingMode) -> () Async
#endif
-
-#if PLATFORM(IOS)
- GrantAccessToAssetServices(WebKit::SandboxExtension::Handle mobileAssetHandle, WebKit::SandboxExtension::Handle mobileAssetV2Handle)
- RevokeAccessToAssetServices()
-#endif
}
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (254993 => 254994)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-01-23 19:50:05 UTC (rev 254993)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-01-23 19:56:38 UTC (rev 254994)
@@ -846,28 +846,6 @@
cache.addSupportedTypes(types);
}
-#if PLATFORM(IOS)
-void WebProcess::grantAccessToAssetServices(WebKit::SandboxExtension::Handle&& mobileAssetHandle, WebKit::SandboxExtension::Handle&& mobileAssetV2Handle)
-{
- if (m_assetServiceExtension && m_assetServiceV2Extension)
- return;
- m_assetServiceExtension = SandboxExtension::create(WTFMove(mobileAssetHandle));
- m_assetServiceExtension->consume();
- m_assetServiceV2Extension = SandboxExtension::create(WTFMove(mobileAssetV2Handle));
- m_assetServiceV2Extension->consume();
-}
-
-void WebProcess::revokeAccessToAssetServices()
-{
- if (!m_assetServiceExtension || !m_assetServiceV2Extension)
- return;
- m_assetServiceExtension->revoke();
- m_assetServiceExtension = nullptr;
- m_assetServiceV2Extension->revoke();
- m_assetServiceV2Extension = nullptr;
-}
-#endif
-
} // namespace WebKit
#undef RELEASE_LOG_SESSION_ID
