Diff
Modified: tags/Safari-606.1.12/Source/WebKit/ChangeLog (230281 => 230282)
--- tags/Safari-606.1.12/Source/WebKit/ChangeLog 2018-04-04 22:58:02 UTC (rev 230281)
+++ tags/Safari-606.1.12/Source/WebKit/ChangeLog 2018-04-04 22:58:06 UTC (rev 230282)
@@ -1,3 +1,43 @@
+2018-04-04 Jason Marcell <[email protected]>
+
+ Cherry-pick r230268. rdar://problem/39164641
+
+ Fix the print formatter build
+ https://bugs.webkit.org/show_bug.cgi?id=184289
+ -and corresponding-
+ rdar://problem/39164641
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _webViewPrintFormatter]):
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/_WKWebViewPrintFormatter.h:
+ * UIProcess/_WKWebViewPrintFormatter.mm:
+ * UIProcess/_WKWebViewPrintFormatterInternal.h:
+ * UIProcess/ios/WKContentView.mm:
+ * UIProcess/ios/WKPDFView.mm:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230268 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-04-03 Beth Dakin <[email protected]>
+
+ Fix the print formatter build
+ https://bugs.webkit.org/show_bug.cgi?id=184289
+ -and corresponding-
+ rdar://problem/39164641
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _webViewPrintFormatter]):
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/_WKWebViewPrintFormatter.h:
+ * UIProcess/_WKWebViewPrintFormatter.mm:
+ * UIProcess/_WKWebViewPrintFormatterInternal.h:
+ * UIProcess/ios/WKContentView.mm:
+ * UIProcess/ios/WKPDFView.mm:
+
2018-04-03 Carlos Garcia Campos <[email protected]>
ASSERTION FAILED: !m_mainFrame->coreFrame()->loader().frameHasLoaded() || !m_pendingNavigationID when reloading page while a page is loading
Modified: tags/Safari-606.1.12/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (230281 => 230282)
--- tags/Safari-606.1.12/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-04-04 22:58:02 UTC (rev 230281)
+++ tags/Safari-606.1.12/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-04-04 22:58:06 UTC (rev 230282)
@@ -5475,9 +5475,13 @@
- (_WKWebViewPrintFormatter *)_webViewPrintFormatter
{
+#if !ENABLE(MINIMAL_SIMULATOR)
UIViewPrintFormatter *viewPrintFormatter = self.viewPrintFormatter;
ASSERT([viewPrintFormatter isKindOfClass:[_WKWebViewPrintFormatter class]]);
return (_WKWebViewPrintFormatter *)viewPrintFormatter;
+#else
+ return nil;
+#endif // ENABLE(MINIMAL_SIMULATOR)
}
static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(UISemanticContentAttribute contentAttribute)
@@ -6426,7 +6430,7 @@
#endif // PLATFORM(MAC)
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && !ENABLE(MINIMAL_SIMULATOR)
@implementation WKWebView (_WKWebViewPrintFormatter)
- (Class)_printFormatterClass
Modified: tags/Safari-606.1.12/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h (230281 => 230282)
--- tags/Safari-606.1.12/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h 2018-04-04 22:58:02 UTC (rev 230281)
+++ tags/Safari-606.1.12/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h 2018-04-04 22:58:06 UTC (rev 230282)
@@ -170,7 +170,7 @@
@end
#endif // ENABLE(FULLSCREEN_API) && PLATFORM(IOS)
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && !ENABLE(MINIMAL_SIMULATOR)
@interface WKWebView (_WKWebViewPrintFormatter)
@property (nonatomic, readonly) id <_WKWebViewPrintProvider> _printProvider;
@end
Modified: tags/Safari-606.1.12/Source/WebKit/UIProcess/_WKWebViewPrintFormatter.mm (230281 => 230282)
--- tags/Safari-606.1.12/Source/WebKit/UIProcess/_WKWebViewPrintFormatter.mm 2018-04-04 22:58:02 UTC (rev 230281)
+++ tags/Safari-606.1.12/Source/WebKit/UIProcess/_WKWebViewPrintFormatter.mm 2018-04-04 22:58:06 UTC (rev 230282)
@@ -26,7 +26,7 @@
#import "config.h"
#import "_WKWebViewPrintFormatterInternal.h"
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && !ENABLE(MINIMAL_SIMULATOR)
#import "WKWebViewInternal.h"
#import "_WKFrameHandle.h"
@@ -116,4 +116,4 @@
@end
-#endif // PLATFORM(IOS)
+#endif // PLATFORM(IOS) && !ENABLE(MINIMAL_SIMULATOR)
Modified: tags/Safari-606.1.12/Source/WebKit/UIProcess/_WKWebViewPrintFormatterInternal.h (230281 => 230282)
--- tags/Safari-606.1.12/Source/WebKit/UIProcess/_WKWebViewPrintFormatterInternal.h 2018-04-04 22:58:02 UTC (rev 230281)
+++ tags/Safari-606.1.12/Source/WebKit/UIProcess/_WKWebViewPrintFormatterInternal.h 2018-04-04 22:58:06 UTC (rev 230282)
@@ -25,7 +25,7 @@
#import "_WKWebViewPrintFormatter.h"
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && !ENABLE(MINIMAL_SIMULATOR)
@interface UIPrintFormatter ()
- (CGRect)_pageContentRect:(BOOL)firstPage;
@@ -41,4 +41,4 @@
@property (nonatomic, readonly) CGPDFDocumentRef _wk_printedDocument;
@end
-#endif // PLATFORM(IOS)
+#endif // PLATFORM(IOS) && !ENABLE(MINIMAL_SIMULATOR)
Modified: tags/Safari-606.1.12/Source/WebKit/UIProcess/ios/WKContentView.mm (230281 => 230282)
--- tags/Safari-606.1.12/Source/WebKit/UIProcess/ios/WKContentView.mm 2018-04-04 22:58:02 UTC (rev 230281)
+++ tags/Safari-606.1.12/Source/WebKit/UIProcess/ios/WKContentView.mm 2018-04-04 22:58:06 UTC (rev 230282)
@@ -676,6 +676,8 @@
#pragma mark Printing
+#if !ENABLE(MINIMAL_SIMULATOR)
+
@interface WKContentView (_WKWebViewPrintFormatter) <_WKWebViewPrintProvider>
@end
@@ -742,4 +744,6 @@
@end
+#endif // !ENABLE(MINIMAL_SIMULATOR)
+
#endif // PLATFORM(IOS)
Modified: tags/Safari-606.1.12/Source/WebKit/UIProcess/ios/WKPDFView.mm (230281 => 230282)
--- tags/Safari-606.1.12/Source/WebKit/UIProcess/ios/WKPDFView.mm 2018-04-04 22:58:02 UTC (rev 230281)
+++ tags/Safari-606.1.12/Source/WebKit/UIProcess/ios/WKPDFView.mm 2018-04-04 22:58:06 UTC (rev 230282)
@@ -866,6 +866,8 @@
#pragma mark Printing
+#if !ENABLE(MINIMAL_SIMULATOR)
+
@interface WKPDFView (_WKWebViewPrintFormatter) <_WKWebViewPrintProvider>
@end
@@ -891,6 +893,8 @@
@end
+#endif // !ENABLE(MINIMAL_SIMULATOR)
+
#pragma clang diagnostic pop
#endif // PLATFORM(IOS) && ENABLE(WKPDFVIEW)
