Title: [230694] trunk
Revision
230694
Author
aes...@apple.com
Date
2018-04-16 18:20:43 -0700 (Mon, 16 Apr 2018)

Log Message

[iOS] Enable WKPDFView by default
https://bugs.webkit.org/show_bug.cgi?id=184675
<rdar://problem/27885452>

Reviewed by Darin Adler.

Source/WebKit:

* UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
(-[WKWebViewContentProviderRegistry init]):

Source/WTF:

* wtf/FeatureDefines.h:

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (230693 => 230694)


--- trunk/Source/WTF/ChangeLog	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Source/WTF/ChangeLog	2018-04-17 01:20:43 UTC (rev 230694)
@@ -1,3 +1,13 @@
+2018-04-16  Andy Estes  <aes...@apple.com>
+
+        [iOS] Enable WKPDFView by default
+        https://bugs.webkit.org/show_bug.cgi?id=184675
+        <rdar://problem/27885452>
+
+        Reviewed by Darin Adler.
+
+        * wtf/FeatureDefines.h:
+
 2018-04-16  Per Arne Vollan  <pvol...@apple.com>
 
         Deactivate the WindowServer connection for the WebContent process.

Modified: trunk/Source/WTF/wtf/FeatureDefines.h (230693 => 230694)


--- trunk/Source/WTF/wtf/FeatureDefines.h	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Source/WTF/wtf/FeatureDefines.h	2018-04-17 01:20:43 UTC (rev 230694)
@@ -167,7 +167,7 @@
 #endif
 
 #if !defined(ENABLE_WKLEGACYPDFVIEW)
-#if PLATFORM(IOS) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !ENABLE(MINIMAL_SIMULATOR)
+#if PLATFORM(IOS) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !ENABLE(MINIMAL_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED < 120000
 #define ENABLE_WKLEGACYPDFVIEW 1
 #endif
 #endif

Modified: trunk/Source/WebKit/ChangeLog (230693 => 230694)


--- trunk/Source/WebKit/ChangeLog	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Source/WebKit/ChangeLog	2018-04-17 01:20:43 UTC (rev 230694)
@@ -1,3 +1,14 @@
+2018-04-16  Andy Estes  <aes...@apple.com>
+
+        [iOS] Enable WKPDFView by default
+        https://bugs.webkit.org/show_bug.cgi?id=184675
+        <rdar://problem/27885452>
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
+        (-[WKWebViewContentProviderRegistry init]):
+
 2018-04-16  Brent Fulgham  <bfulg...@apple.com>
 
         [macOS] Don't establish unneeded Dock connections

Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm (230693 => 230694)


--- trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm	2018-04-17 01:20:43 UTC (rev 230694)
@@ -31,6 +31,7 @@
 #if PLATFORM(IOS)
 
 #import "WKLegacyPDFView.h"
+#import "WKPDFView.h"
 #import "WKSystemPreviewView.h"
 #import "WKWebViewInternal.h"
 #import "WebPageProxy.h"
@@ -56,8 +57,11 @@
     if (!(self = [super init]))
         return nil;
 
-#if ENABLE(WKLEGACYPDFVIEW)
+#if ENABLE(WKPDFVIEW)
     for (auto& mimeType : WebCore::MIMETypeRegistry::getPDFMIMETypes())
+        [self registerProvider:[WKPDFView class] forMIMEType:mimeType];
+#elif ENABLE(WKLEGACYPDFVIEW)
+    for (auto& mimeType : WebCore::MIMETypeRegistry::getPDFMIMETypes())
         [self registerProvider:[WKLegacyPDFView class] forMIMEType:mimeType];
 #endif
 

Modified: trunk/Tools/ChangeLog (230693 => 230694)


--- trunk/Tools/ChangeLog	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Tools/ChangeLog	2018-04-17 01:20:43 UTC (rev 230694)
@@ -1,3 +1,13 @@
+2018-04-16  Andy Estes  <aes...@apple.com>
+
+        [iOS] Enable WKPDFView by default
+        https://bugs.webkit.org/show_bug.cgi?id=184675
+        <rdar://problem/27885452>
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm:
+
 2018-04-16  Leo Balter  <leonardo.bal...@gmail.com>
 
         Perl-based Test262 runner

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm (230693 => 230694)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm	2018-04-17 01:20:43 UTC (rev 230694)
@@ -26,7 +26,8 @@
 #import "config.h"
 #import <WebKit/WKFoundation.h>
 
-#if WK_API_ENABLED && TARGET_OS_IPHONE
+// FIXME: Enable these tests on iOS 12 once rdar://problem/39475542 is resolved.
+#if WK_API_ENABLED && TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < 120000
 
 #import "PlatformUtilities.h"
 #import "TestNavigationDelegate.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to