<!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>[166775] tags/Safari-538.27.2/Source/WebKit2</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/166775">166775</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-04-04 00:54:40 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/166767">r166767</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari538272SourceWebKit2ChangeLog">tags/Safari-538.27.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari538272SourceWebKit2UIProcessAPICocoaWKWebViewmm">tags/Safari-538.27.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#tagsSafari538272SourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">tags/Safari-538.27.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#tagsSafari538272SourceWebKit2UIProcessCocoaWKWebViewContentProviderh">tags/Safari-538.27.2/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h</a></li>
<li><a href="#tagsSafari538272SourceWebKit2UIProcessiosWKPDFViewh">tags/Safari-538.27.2/Source/WebKit2/UIProcess/ios/WKPDFView.h</a></li>
<li><a href="#tagsSafari538272SourceWebKit2UIProcessiosWKPDFViewmm">tags/Safari-538.27.2/Source/WebKit2/UIProcess/ios/WKPDFView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari538272SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.27.2/Source/WebKit2/ChangeLog (166774 => 166775)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.27.2/Source/WebKit2/ChangeLog 2014-04-04 07:50:59 UTC (rev 166774)
+++ tags/Safari-538.27.2/Source/WebKit2/ChangeLog 2014-04-04 07:54:40 UTC (rev 166775)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-04-04 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r166767
+
+ 2014-04-03 Andy Estes <aestes@apple.com>
+
+ [Cocoa] Add additional WKWebView SPI for clients that interact with PDFs
+ https://bugs.webkit.org/show_bug.cgi?id=131206
+
+ Reviewed by Dan Bernstein.
+
+ Add _dataForDisplayedPDF and _suggestedFilenameForDisplayedPDF to
+ support clients that wish to save a copy of the currently displayed PDF
+ to disk. Ultimately we should support this use case by exposing something
+ like WKWebViewContentProvider, but for now let's do something simple.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _didFinishLoadingDataForCustomContentProviderWithSuggestedFilename:data:]):
+ (-[WKWebView _dataForDisplayedPDF]):
+ (-[WKWebView _suggestedFilenameForDisplayedPDF]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/Cocoa/WKWebViewContentProvider.h:
+ * UIProcess/ios/WKPDFView.h:
+ * UIProcess/ios/WKPDFView.mm:
+ (-[WKPDFView documentData]):
+ (-[WKPDFView suggestedFilename]):
+ (-[WKPDFView web_setContentProviderData:suggestedFilename:]):
+
+2014-04-04 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r166769
</span><span class="cx">
</span><span class="cx"> 2014-04-03 Chris Fleizach <cfleizach@apple.com>
</span></span></pre></div>
<a id="tagsSafari538272SourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.27.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (166774 => 166775)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.27.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-04 07:50:59 UTC (rev 166774)
+++ tags/Safari-538.27.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-04 07:54:40 UTC (rev 166775)
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> - (void)_didFinishLoadingDataForCustomContentProviderWithSuggestedFilename:(const String&)suggestedFilename data:(NSData *)data
</span><span class="cx"> {
</span><span class="cx"> ASSERT(_customContentView);
</span><del>- [_customContentView web_setContentProviderData:data];
</del><ins>+ [_customContentView web_setContentProviderData:data suggestedFilename:suggestedFilename];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didCommitLoadForMainFrame
</span><span class="lines">@@ -1236,6 +1236,20 @@
</span><span class="cx"> return [_customContentView isKindOfClass:[WKPDFView class]];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSData *)_dataForDisplayedPDF
+{
+ if (![self _isDisplayingPDF])
+ return nil;
+ return [(WKPDFView *)_customContentView.get() documentData];
+}
+
+- (NSString *)_suggestedFilenameForDisplayedPDF
+{
+ if (![self _isDisplayingPDF])
+ return nil;
+ return [(WKPDFView *)_customContentView.get() suggestedFilename];
+}
+
</ins><span class="cx"> // FIXME: Remove this once nobody uses it.
</span><span class="cx"> - (NSURL *)activeURL
</span><span class="cx"> {
</span></span></pre></div>
<a id="tagsSafari538272SourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.27.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (166774 => 166775)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.27.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-04-04 07:50:59 UTC (rev 166774)
+++ tags/Safari-538.27.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-04-04 07:54:40 UTC (rev 166775)
</span><span class="lines">@@ -99,7 +99,11 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setBackgroundExtendsBeyondPage:) BOOL _backgroundExtendsBeyondPage;
</span><span class="cx">
</span><ins>+// FIXME: Remove these three properties once we expose WKWebViewContentProvider as API.
</ins><span class="cx"> @property (nonatomic, readonly, getter=_isDisplayingPDF) BOOL _displayingPDF;
</span><ins>+@property (nonatomic, readonly) NSData *_dataForDisplayedPDF;
+// FIXME: This can be removed once WKNavigation's response property is implemented.
+@property (nonatomic, readonly) NSString *_suggestedFilenameForDisplayedPDF;
</ins><span class="cx">
</span><span class="cx"> - (void)_beginInteractiveObscuredInsetsChange;
</span><span class="cx"> - (void)_endInteractiveObscuredInsetsChange;
</span></span></pre></div>
<a id="tagsSafari538272SourceWebKit2UIProcessCocoaWKWebViewContentProviderh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.27.2/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h (166774 => 166775)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.27.2/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h 2014-04-04 07:50:59 UTC (rev 166774)
+++ tags/Safari-538.27.2/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h 2014-04-04 07:54:40 UTC (rev 166775)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> // FIXME: This should be API.
</span><span class="cx"> @protocol WKWebViewContentProvider <NSObject>
</span><span class="cx">
</span><del>-- (void)web_setContentProviderData:(NSData *)data;
</del><ins>+- (void)web_setContentProviderData:(NSData *)data suggestedFilename:(NSString *)filename;
</ins><span class="cx"> - (void)web_setMinimumSize:(CGSize)size;
</span><span class="cx"> - (void)web_setScrollView:(UIScrollView *)scrollView;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538272SourceWebKit2UIProcessiosWKPDFViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.27.2/Source/WebKit2/UIProcess/ios/WKPDFView.h (166774 => 166775)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.27.2/Source/WebKit2/UIProcess/ios/WKPDFView.h 2014-04-04 07:50:59 UTC (rev 166774)
+++ tags/Safari-538.27.2/Source/WebKit2/UIProcess/ios/WKPDFView.h 2014-04-04 07:54:40 UTC (rev 166775)
</span><span class="lines">@@ -30,6 +30,9 @@
</span><span class="cx">
</span><span class="cx"> @interface WKPDFView : UIView <WKWebViewContentProvider>
</span><span class="cx">
</span><ins>+@property (nonatomic, readonly) NSData *documentData;
+@property (nonatomic, readonly) NSString *suggestedFilename;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="tagsSafari538272SourceWebKit2UIProcessiosWKPDFViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.27.2/Source/WebKit2/UIProcess/ios/WKPDFView.mm (166774 => 166775)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.27.2/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2014-04-04 07:50:59 UTC (rev 166774)
+++ tags/Safari-538.27.2/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2014-04-04 07:54:40 UTC (rev 166775)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import <CoreGraphics/CGPDFDocumentPrivate.h>
</ins><span class="cx"> #import <CorePDF/UIPDFDocument.h>
</span><span class="cx"> #import <CorePDF/UIPDFPageView.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="lines">@@ -39,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKPDFView {
</span><span class="cx"> RetainPtr<UIPDFDocument> _pdfDocument;
</span><ins>+ RetainPtr<NSString> _suggestedFilename;
</ins><span class="cx"> Vector<UIPDFPageView*> _pageViews;
</span><span class="cx"> CGSize _minimumSize;
</span><span class="cx"> UIScrollView *_scrollView;
</span><span class="lines">@@ -54,8 +56,20 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)web_setContentProviderData:(NSData *)data
</del><ins>+- (NSData *)documentData
+{
+ return [(NSData *)CGDataProviderCopyData(CGPDFDocumentGetDataProvider([_pdfDocument CGDocument])) autorelease];
+}
+
+- (NSString *)suggestedFilename
</ins><span class="cx"> {
</span><ins>+ return _suggestedFilename.get();
+}
+
+- (void)web_setContentProviderData:(NSData *)data suggestedFilename:(NSString *)filename
+{
+ _suggestedFilename = adoptNS([filename copy]);
+
</ins><span class="cx"> for (auto& pageView : _pageViews)
</span><span class="cx"> [pageView removeFromSuperview];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>