Title: [295198] branches/safari-613-branch/Source/WebKit
- Revision
- 295198
- Author
- alanc...@apple.com
- Date
- 2022-06-02 23:46:11 -0700 (Thu, 02 Jun 2022)
Log Message
Cherry-pick 969b67ab0154. rdar://problem/80059355
Unreviewed, fix the Catalyst build after r292888
`MCProfileConnection` is not available on Mac Catalyst.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _dataOwnerForPasteboard:]):
Canonical link: https://commits.webkit.org/249666@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292896 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebKit/ChangeLog (295197 => 295198)
--- branches/safari-613-branch/Source/WebKit/ChangeLog 2022-06-03 06:46:08 UTC (rev 295197)
+++ branches/safari-613-branch/Source/WebKit/ChangeLog 2022-06-03 06:46:11 UTC (rev 295198)
@@ -1,3 +1,12 @@
+2022-04-14 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Unreviewed, fix the Catalyst build after r292888
+
+ `MCProfileConnection` is not available on Mac Catalyst.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _dataOwnerForPasteboard:]):
+
2022-05-16 Youenn Fablet <you...@apple.com>
Add logging when taking a process assertion synchronously
Modified: branches/safari-613-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (295197 => 295198)
--- branches/safari-613-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2022-06-03 06:46:08 UTC (rev 295197)
+++ branches/safari-613-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2022-06-03 06:46:11 UTC (rev 295198)
@@ -7889,6 +7889,11 @@
if (intent == WebKit::PasteboardAccessIntent::Write)
return coreDataOwnerType(self._dataOwnerForCopy);
+#if !PLATFORM(MACCATALYST)
+ if ([[PAL::getMCProfileConnectionClass() sharedConnection] isURLManaged:[_webView URL]])
+ return WebCore::DataOwnerType::Enterprise;
+#endif
+
ASSERT_NOT_REACHED();
return WebCore::DataOwnerType::Undefined;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
