Title: [260406] branches/safari-610.1.11-branch/Source/WebKit
- Revision
- 260406
- Author
- [email protected]
- Date
- 2020-04-20 17:03:27 -0700 (Mon, 20 Apr 2020)
Log Message
Unreviewed macCatalyst build fix.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::disableServiceWorkerEntitlementInNetworkProcess):
(WebKit::WebPageProxy::clearServiceWorkerEntitlementOverride):
Modified Paths
Diff
Modified: branches/safari-610.1.11-branch/Source/WebKit/ChangeLog (260405 => 260406)
--- branches/safari-610.1.11-branch/Source/WebKit/ChangeLog 2020-04-20 23:08:51 UTC (rev 260405)
+++ branches/safari-610.1.11-branch/Source/WebKit/ChangeLog 2020-04-21 00:03:27 UTC (rev 260406)
@@ -1,3 +1,11 @@
+2020-04-20 Kate Cheney <[email protected]>
+
+ Unreviewed macCatalyst build fix.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::disableServiceWorkerEntitlementInNetworkProcess):
+ (WebKit::WebPageProxy::clearServiceWorkerEntitlementOverride):
+
2020-04-20 Timothy Horton <[email protected]>
Try to fix the macCatalyst build after r260366
Modified: branches/safari-610.1.11-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (260405 => 260406)
--- branches/safari-610.1.11-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-04-20 23:08:51 UTC (rev 260405)
+++ branches/safari-610.1.11-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-04-21 00:03:27 UTC (rev 260406)
@@ -3162,7 +3162,7 @@
void WebPageProxy::disableServiceWorkerEntitlementInNetworkProcess()
{
-#if PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
if (auto* networkProcess = m_process->processPool().networkProcess()) {
if (!networkProcess->canSendMessage())
return;
@@ -3173,7 +3173,7 @@
void WebPageProxy::clearServiceWorkerEntitlementOverride(CompletionHandler<void()>&& completionHandler)
{
-#if PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
auto callbackAggregator = CallbackAggregator::create(WTFMove(completionHandler));
sendWithAsyncReply(Messages::WebPage::ClearServiceWorkerEntitlementOverride(), [callbackAggregator = callbackAggregator.copyRef()] { });
if (auto* networkProcess = m_process->processPool().networkProcess()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
