Title: [283940] trunk/Source
- Revision
- 283940
- Author
- [email protected]
- Date
- 2021-10-11 15:30:31 -0700 (Mon, 11 Oct 2021)
Log Message
Disable SystemPreview in WKContentProviderRegistry
https://bugs.webkit.org/show_bug.cgi?id=231538
rdar://84110761
Reviewed by Tim Horton.
Source/WebKit:
Disable the WebViewContentProvider for System Previews
if UIKIT_WEBKIT_INTERNALS is true.
* UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
(-[WKWebViewContentProviderRegistry initWithConfiguration:]):
* UIProcess/ios/WKSystemPreviewView.h:
* UIProcess/ios/WKSystemPreviewView.mm:
Source/WTF:
Revert the change in r283811.
* wtf/PlatformUse.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (283939 => 283940)
--- trunk/Source/WTF/ChangeLog 2021-10-11 22:19:56 UTC (rev 283939)
+++ trunk/Source/WTF/ChangeLog 2021-10-11 22:30:31 UTC (rev 283940)
@@ -1,3 +1,15 @@
+2021-10-11 Dean Jackson <[email protected]>
+
+ Disable SystemPreview in WKContentProviderRegistry
+ https://bugs.webkit.org/show_bug.cgi?id=231538
+ rdar://84110761
+
+ Reviewed by Tim Horton.
+
+ Revert the change in r283811.
+
+ * wtf/PlatformUse.h:
+
2021-10-11 Alex Christensen <[email protected]>
Prepare to switch from WTF::Variant to std::variant
Modified: trunk/Source/WTF/wtf/PlatformUse.h (283939 => 283940)
--- trunk/Source/WTF/wtf/PlatformUse.h 2021-10-11 22:19:56 UTC (rev 283939)
+++ trunk/Source/WTF/wtf/PlatformUse.h 2021-10-11 22:30:31 UTC (rev 283940)
@@ -165,7 +165,7 @@
#define USE_QUICK_LOOK 1
#endif
-#if PLATFORM(IOS) && !HAVE(UIKIT_WEBKIT_INTERNALS)
+#if PLATFORM(IOS)
#define USE_SYSTEM_PREVIEW 1
#endif
Modified: trunk/Source/WebKit/ChangeLog (283939 => 283940)
--- trunk/Source/WebKit/ChangeLog 2021-10-11 22:19:56 UTC (rev 283939)
+++ trunk/Source/WebKit/ChangeLog 2021-10-11 22:30:31 UTC (rev 283940)
@@ -1,3 +1,19 @@
+2021-10-11 Dean Jackson <[email protected]>
+
+ Disable SystemPreview in WKContentProviderRegistry
+ https://bugs.webkit.org/show_bug.cgi?id=231538
+ rdar://84110761
+
+ Reviewed by Tim Horton.
+
+ Disable the WebViewContentProvider for System Previews
+ if UIKIT_WEBKIT_INTERNALS is true.
+
+ * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
+ (-[WKWebViewContentProviderRegistry initWithConfiguration:]):
+ * UIProcess/ios/WKSystemPreviewView.h:
+ * UIProcess/ios/WKSystemPreviewView.mm:
+
2021-10-11 Alex Christensen <[email protected]>
Unified build fix
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm (283939 => 283940)
--- trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm 2021-10-11 22:19:56 UTC (rev 283939)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm 2021-10-11 22:30:31 UTC (rev 283940)
@@ -54,7 +54,7 @@
[self registerProvider:[WKPDFView class] forMIMEType:@(type)];
#endif
-#if USE(SYSTEM_PREVIEW)
+#if USE(SYSTEM_PREVIEW) && !HAVE(UIKIT_WEBKIT_INTERNALS)
if (configuration._systemPreviewEnabled) {
for (auto& type : WebCore::MIMETypeRegistry::systemPreviewMIMETypes())
[self registerProvider:[WKSystemPreviewView class] forMIMEType:@(type)];
Modified: trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.h (283939 => 283940)
--- trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.h 2021-10-11 22:19:56 UTC (rev 283939)
+++ trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.h 2021-10-11 22:30:31 UTC (rev 283940)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if USE(SYSTEM_PREVIEW)
+#if USE(SYSTEM_PREVIEW) && !HAVE(UIKIT_WEBKIT_INTERNALS)
#import "WKApplicationStateTrackingView.h"
#import "WKWebViewContentProvider.h"
Modified: trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm (283939 => 283940)
--- trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm 2021-10-11 22:19:56 UTC (rev 283939)
+++ trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm 2021-10-11 22:30:31 UTC (rev 283940)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKSystemPreviewView.h"
-#if USE(SYSTEM_PREVIEW)
+#if USE(SYSTEM_PREVIEW) && !HAVE(UIKIT_WEBKIT_INTERNALS)
#import "APIFindClient.h"
#import "APIUIClient.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
