Changeset 251673 in webkit

Timestamp:

Oct 28, 2019, 2:42:43 PM (7 years ago)

Author:

beidson@apple.com

Message:

Expose _printOperationWithPrintInfo: SPI as API
<rdar://problem/36557179> and ​https://bugs.webkit.org/show_bug.cgi?id=203496

Reviewed by Andy Estes.

Source/WebKit:

• UIProcess/API/Cocoa/WKWebView.h:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView printOperationWithPrintInfo:]):
(-[WKWebView _printOperationWithPrintInfo:]):

Tools:

• MiniBrowser/mac/WK2BrowserWindowController.m:

(-[WK2BrowserWindowController printWebView:]):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebView.h (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/mac/WK2BrowserWindowController.m (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-10-28  Brady Eidson  <beidson@apple.com>
+
+        Expose _printOperationWithPrintInfo: SPI as API
+        <rdar://problem/36557179> and https://bugs.webkit.org/show_bug.cgi?id=203496
+
+        Reviewed by Andy Estes.
+
+        * UIProcess/API/Cocoa/WKWebView.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView printOperationWithPrintInfo:]):
+        (-[WKWebView _printOperationWithPrintInfo:]):
+
 2019-10-28  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h

@@ -301 +301 @@
 + (BOOL)handlesURLScheme:(NSString *)urlScheme WK_API_AVAILABLE(macos(10.13), ios(11.0));
 
+#if !TARGET_OS_IPHONE
+/* @abstract Returns an NSPrintOperation object configured to print the contents of this WKWebView
+@param printInfo The print info object used to configure the resulting print operation.
+*/
+- (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo WK_API_AVAILABLE(macos(WK_MAC_TBA));
+#endif
 @end
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -4634 +4634 @@
 #endif // ENABLE(DRAG_SUPPORT)
 
+- (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo
+{
+    if (auto webFrameProxy = _page->mainFrame())
+        return _impl->printOperationWithPrintInfo(printInfo, *webFrameProxy);
+    return nil;
+}
+
 #endif // PLATFORM(MAC)
 
@@ -6746 +6753 @@
 - (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo
 {
-    if (auto webFrameProxy = _page->mainFrame())
-        return _impl->printOperationWithPrintInfo(printInfo, *webFrameProxy);
-    return nil;
+    return [self printOperationWithPrintInfo:printInfo];
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-10-28  Brady Eidson  <beidson@apple.com>
+
+        Expose _printOperationWithPrintInfo: SPI as API
+        <rdar://problem/36557179> and https://bugs.webkit.org/show_bug.cgi?id=203496
+
+        Reviewed by Andy Estes.
+
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController printWebView:]):
+
 2019-10-28  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

@@ -645 +645 @@
 - (IBAction)printWebView:(id)sender
 {
-    [[_webView _printOperationWithPrintInfo:[NSPrintInfo sharedPrintInfo]] runOperationModalForWindow:self.window delegate:nil didRunSelector:nil contextInfo:nil];
+    [[_webView printOperationWithPrintInfo:[NSPrintInfo sharedPrintInfo]] runOperationModalForWindow:self.window delegate:nil didRunSelector:nil contextInfo:nil];
 }