Title: [249492] trunk/Source/WebKit
- Revision
- 249492
- Author
- timothy_hor...@apple.com
- Date
- 2019-09-04 12:37:38 -0700 (Wed, 04 Sep 2019)
Log Message
macCatalyst: Re-enable iOS WKWebView printing API
https://bugs.webkit.org/show_bug.cgi?id=201392
<rdar://problem/54690252>
Reviewed by Wenson Hsieh.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _webViewPrintFormatter]):
* UIProcess/API/Cocoa/WKWebViewInternal.h:
* UIProcess/_WKWebViewPrintFormatter.mm:
* UIProcess/_WKWebViewPrintFormatterInternal.h:
* UIProcess/ios/WKContentView.mm:
_WKWwebViewPrintFormatter was disabled during bringup because requisite
UIKit bits were missing, but they are not anymore (and have not been for
quite some time), so remove these unnecessary platform ifdefs.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (249491 => 249492)
--- trunk/Source/WebKit/ChangeLog 2019-09-04 19:23:33 UTC (rev 249491)
+++ trunk/Source/WebKit/ChangeLog 2019-09-04 19:37:38 UTC (rev 249492)
@@ -1,3 +1,21 @@
+2019-09-04 Tim Horton <timothy_hor...@apple.com>
+
+ macCatalyst: Re-enable iOS WKWebView printing API
+ https://bugs.webkit.org/show_bug.cgi?id=201392
+ <rdar://problem/54690252>
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _webViewPrintFormatter]):
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/_WKWebViewPrintFormatter.mm:
+ * UIProcess/_WKWebViewPrintFormatterInternal.h:
+ * UIProcess/ios/WKContentView.mm:
+ _WKWwebViewPrintFormatter was disabled during bringup because requisite
+ UIKit bits were missing, but they are not anymore (and have not been for
+ quite some time), so remove these unnecessary platform ifdefs.
+
2019-09-04 Patrick Griffis <pgrif...@igalia.com>
[WPE][GTK] Fix sandbox parsing DISPLAY on X11
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (249491 => 249492)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-09-04 19:23:33 UTC (rev 249491)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-09-04 19:37:38 UTC (rev 249492)
@@ -6427,13 +6427,9 @@
- (_WKWebViewPrintFormatter *)_webViewPrintFormatter
{
-#if !PLATFORM(MACCATALYST)
UIViewPrintFormatter *viewPrintFormatter = self.viewPrintFormatter;
ASSERT([viewPrintFormatter isKindOfClass:[_WKWebViewPrintFormatter class]]);
return (_WKWebViewPrintFormatter *)viewPrintFormatter;
-#else
- return nil;
-#endif // PLATFORM(MACCATALYST)
}
static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(UISemanticContentAttribute contentAttribute)
@@ -7538,7 +7534,7 @@
#endif // PLATFORM(MAC)
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
+#if PLATFORM(IOS_FAMILY)
@implementation WKWebView (_WKWebViewPrintFormatter)
- (Class)_printFormatterClass
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h (249491 => 249492)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h 2019-09-04 19:23:33 UTC (rev 249491)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h 2019-09-04 19:37:38 UTC (rev 249492)
@@ -199,7 +199,7 @@
@end
#endif
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
+#if PLATFORM(IOS_FAMILY)
@interface WKWebView (_WKWebViewPrintFormatter)
@property (nonatomic, readonly) id <_WKWebViewPrintProvider> _printProvider;
@end
Modified: trunk/Source/WebKit/UIProcess/_WKWebViewPrintFormatter.mm (249491 => 249492)
--- trunk/Source/WebKit/UIProcess/_WKWebViewPrintFormatter.mm 2019-09-04 19:23:33 UTC (rev 249491)
+++ trunk/Source/WebKit/UIProcess/_WKWebViewPrintFormatter.mm 2019-09-04 19:37:38 UTC (rev 249492)
@@ -26,7 +26,7 @@
#import "config.h"
#import "_WKWebViewPrintFormatterInternal.h"
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
+#if PLATFORM(IOS_FAMILY)
#import "WKWebViewInternal.h"
#import "_WKFrameHandle.h"
@@ -116,4 +116,4 @@
@end
-#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
+#endif // PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/UIProcess/_WKWebViewPrintFormatterInternal.h (249491 => 249492)
--- trunk/Source/WebKit/UIProcess/_WKWebViewPrintFormatterInternal.h 2019-09-04 19:23:33 UTC (rev 249491)
+++ trunk/Source/WebKit/UIProcess/_WKWebViewPrintFormatterInternal.h 2019-09-04 19:37:38 UTC (rev 249492)
@@ -25,7 +25,7 @@
#import "_WKWebViewPrintFormatter.h"
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
+#if PLATFORM(IOS_FAMILY)
@interface UIPrintFormatter ()
- (CGRect)_pageContentRect:(BOOL)firstPage;
@@ -41,4 +41,4 @@
@property (nonatomic, readonly) CGPDFDocumentRef _wk_printedDocument;
@end
-#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
+#endif // PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentView.mm (249491 => 249492)
--- trunk/Source/WebKit/UIProcess/ios/WKContentView.mm 2019-09-04 19:23:33 UTC (rev 249491)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentView.mm 2019-09-04 19:37:38 UTC (rev 249492)
@@ -689,8 +689,6 @@
#pragma mark Printing
-#if !PLATFORM(MACCATALYST)
-
@interface WKContentView (_WKWebViewPrintFormatter) <_WKWebViewPrintProvider>
@end
@@ -757,6 +755,4 @@
@end
-#endif // !PLATFORM(MACCATALYST)
-
#endif // PLATFORM(IOS_FAMILY)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
