Title: [284168] branches/safari-613.1.5-branch/Source
- Revision
- 284168
- Author
- [email protected]
- Date
- 2021-10-14 09:49:21 -0700 (Thu, 14 Oct 2021)
Log Message
Cherry-pick r283940. rdar://problem/84158485
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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283940 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.5-branch/Source/WTF/ChangeLog (284167 => 284168)
--- branches/safari-613.1.5-branch/Source/WTF/ChangeLog 2021-10-14 16:39:37 UTC (rev 284167)
+++ branches/safari-613.1.5-branch/Source/WTF/ChangeLog 2021-10-14 16:49:21 UTC (rev 284168)
@@ -1,3 +1,43 @@
+2021-10-14 Russell Epstein <[email protected]>
+
+ Cherry-pick r283940. rdar://problem/84158485
+
+ 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:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283940 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-08 Tim Horton <[email protected]>
defaultAlternateFormControlDesignEnabled() can't read UIUserInterfaceIdiom in the Web Content process
Modified: branches/safari-613.1.5-branch/Source/WTF/wtf/PlatformUse.h (284167 => 284168)
--- branches/safari-613.1.5-branch/Source/WTF/wtf/PlatformUse.h 2021-10-14 16:39:37 UTC (rev 284167)
+++ branches/safari-613.1.5-branch/Source/WTF/wtf/PlatformUse.h 2021-10-14 16:49:21 UTC (rev 284168)
@@ -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: branches/safari-613.1.5-branch/Source/WebKit/ChangeLog (284167 => 284168)
--- branches/safari-613.1.5-branch/Source/WebKit/ChangeLog 2021-10-14 16:39:37 UTC (rev 284167)
+++ branches/safari-613.1.5-branch/Source/WebKit/ChangeLog 2021-10-14 16:49:21 UTC (rev 284168)
@@ -1,3 +1,47 @@
+2021-10-14 Russell Epstein <[email protected]>
+
+ Cherry-pick r283940. rdar://problem/84158485
+
+ 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:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283940 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-12 Russell Epstein <[email protected]>
Cherry-pick r283977. rdar://problem/84174728
Modified: branches/safari-613.1.5-branch/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm (284167 => 284168)
--- branches/safari-613.1.5-branch/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm 2021-10-14 16:39:37 UTC (rev 284167)
+++ branches/safari-613.1.5-branch/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm 2021-10-14 16:49:21 UTC (rev 284168)
@@ -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: branches/safari-613.1.5-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.h (284167 => 284168)
--- branches/safari-613.1.5-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.h 2021-10-14 16:39:37 UTC (rev 284167)
+++ branches/safari-613.1.5-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.h 2021-10-14 16:49:21 UTC (rev 284168)
@@ -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: branches/safari-613.1.5-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm (284167 => 284168)
--- branches/safari-613.1.5-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm 2021-10-14 16:39:37 UTC (rev 284167)
+++ branches/safari-613.1.5-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm 2021-10-14 16:49:21 UTC (rev 284168)
@@ -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
