<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192447] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192447">192447</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-11-13 16:00:56 -0800 (Fri, 13 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support printing in WKWebView
https://bugs.webkit.org/show_bug.cgi?id=151276
<rdar://problem/23525715>
Reviewed by Beth Dakin.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _printOperationWithPrintInfo:]):
(-[WKWebView _printOperationWithPrintInfo:forFrame:]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
Expose SPI similar to what we have on WKView.
* MiniBrowser/mac/MainMenu.xib:
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController printWebView:]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController printWebView:]):
Hook up printing to Minibrowser!</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacMainMenuxib">trunk/Tools/MiniBrowser/mac/MainMenu.xib</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192446 => 192447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-13 23:47:01 UTC (rev 192446)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-14 00:00:56 UTC (rev 192447)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-11-13 Tim Horton <timothy_horton@apple.com>
+
+ Support printing in WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=151276
+ <rdar://problem/23525715>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _printOperationWithPrintInfo:]):
+ (-[WKWebView _printOperationWithPrintInfo:forFrame:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ Expose SPI similar to what we have on WKView.
+
</ins><span class="cx"> 2015-11-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Follow-up to r192437. Add availability macros.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (192446 => 192447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-13 23:47:01 UTC (rev 192446)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-14 00:00:56 UTC (rev 192447)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> #import "_WKDiagnosticLoggingDelegate.h"
</span><span class="cx"> #import "_WKFindDelegate.h"
</span><span class="cx"> #import "_WKFormDelegate.h"
</span><ins>+#import "_WKFrameHandleInternal.h"
</ins><span class="cx"> #import "_WKHitTestResultInternal.h"
</span><span class="cx"> #import "_WKInputDelegate.h"
</span><span class="cx"> #import "_WKRemoteObjectRegistryInternal.h"
</span><span class="lines">@@ -92,7 +93,6 @@
</span><span class="cx"> #import <wtf/TemporaryChange.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import "_WKFrameHandleInternal.h"
</del><span class="cx"> #import "_WKWebViewPrintFormatter.h"
</span><span class="cx"> #import "PrintInfo.h"
</span><span class="cx"> #import "ProcessThrottler.h"
</span><span class="lines">@@ -4066,6 +4066,20 @@
</span><span class="cx"> _impl->setClipsToVisibleRect(expandsToFit);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo
+{
+ if (auto webFrameProxy = _page->mainFrame())
+ return _impl->printOperationWithPrintInfo(printInfo, *webFrameProxy);
+ return nil;
+}
+
+- (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(_WKFrameHandle *)frameHandle
+{
+ if (auto webFrameProxy = _page->process().webFrame(frameHandle._frameID))
+ return _impl->printOperationWithPrintInfo(printInfo, *webFrameProxy);
+ return nil;
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (192446 => 192447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-11-13 23:47:01 UTC (rev 192446)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-11-14 00:00:56 UTC (rev 192447)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> } WK_AVAILABLE(WK_MAC_TBA, NA);
</span><span class="cx">
</span><span class="cx"> @class WKBrowsingContextHandle;
</span><ins>+@class _WKFrameHandle;
</ins><span class="cx"> @class _WKHitTestResult;
</span><span class="cx"> @class _WKRemoteObjectRegistry;
</span><span class="cx"> @class _WKSessionState;
</span><span class="lines">@@ -188,6 +189,9 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setMinimumLayoutWidth:) CGFloat _minimumLayoutWidth WK_AVAILABLE(WK_MAC_TBA, NA);
</span><span class="cx">
</span><ins>+- (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo;
+- (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(_WKFrameHandle *)frameHandle WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> - (WKNavigation *)_reloadWithoutContentBlockers WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192446 => 192447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-13 23:47:01 UTC (rev 192446)
+++ trunk/Tools/ChangeLog 2015-11-14 00:00:56 UTC (rev 192447)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-11-13 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Support printing in WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=151276
+ <rdar://problem/23525715>
+
+ Reviewed by Beth Dakin.
+
+ * MiniBrowser/mac/MainMenu.xib:
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController printWebView:]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController printWebView:]):
+ Hook up printing to Minibrowser!
+
+2015-11-13 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Hardware keyboard spacebar scrolls too far on iOS
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151227
</span><span class="cx"> <rdar://problem/23500681>
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacMainMenuxib"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/MainMenu.xib (192446 => 192447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/MainMenu.xib 2015-11-13 23:47:01 UTC (rev 192446)
+++ trunk/Tools/MiniBrowser/mac/MainMenu.xib 2015-11-14 00:00:56 UTC (rev 192447)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Print…" keyEquivalent="p" id="78">
</span><span class="cx"> <connections>
</span><del>- <action selector="print:" target="-1" id="86"/>
</del><ins>+ <action selector="printWebView:" target="-1" id="86"/>
</ins><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><span class="cx"> </items>
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (192446 => 192447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-11-13 23:47:01 UTC (rev 192446)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-11-14 00:00:56 UTC (rev 192447)
</span><span class="lines">@@ -283,6 +283,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)printWebView:(id)sender
+{
+ [[[[_webView mainFrame] frameView] printOperationWithPrintInfo:[NSPrintInfo sharedPrintInfo]] runOperationModalForWindow:self.window delegate:nil didRunSelector:nil contextInfo:nil];
+}
+
</ins><span class="cx"> - (void)webView:(WebView *)sender didLayout:(WebLayoutMilestones)milestones
</span><span class="cx"> {
</span><span class="cx"> if (milestones & WebDidFirstLayout)
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (192446 => 192447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-11-13 23:47:01 UTC (rev 192446)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-11-14 00:00:56 UTC (rev 192447)
</span><span class="lines">@@ -501,6 +501,11 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)printWebView:(id)sender
+{
+ [[_webView _printOperationWithPrintInfo:[NSPrintInfo sharedPrintInfo] forFrame:nil] runOperationModalForWindow:self.window delegate:nil didRunSelector:nil contextInfo:nil];
+}
+
</ins><span class="cx"> #pragma mark WKNavigationDelegate
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler
</span></span></pre>
</div>
</div>
</body>
</html>