<!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>[172230] branches/safari-600.1-branch/Source</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/172230">172230</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 13:01:15 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172035">r172035</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformnetworkiosQuickLookmm">branches/safari-600.1-branch/Source/WebCore/platform/network/ios/QuickLook.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessNetworkWebResourceLoadercpp">branches/safari-600.1-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172229 => 172230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 19:55:31 UTC (rev 172229)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 20:01:15 UTC (rev 172230)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-08-07 Dana Burkart <dburkart@apple.com>
+
+ Merge r172035. <rdar://problem/17869353>
+
+ 2014-08-04 Andy Estes <aestes@apple.com>
+
+ [iOS] The raw bytes of an iWork document's PDF preview are displayed rather than the PDF itself
+ https://bugs.webkit.org/show_bug.cgi?id=135596
+
+ Reviewed by David Kilzer.
+
+ Some iWork documents contain pre-rendered PDF previews. When WebKit asks QuickLook to convert such a document,
+ QuickLook will return this PDF as the converted response. However, until WebKit has sent the document's data to
+ QuickLook, -[QLPreviewConverter previewResponse] will misleadingly tell WebKit that the converted resource will
+ be of type 'text/html'. This leads WebKit to render the PDF preview as HTML.
+
+ Instead of querying QLPreviewConverter for the previewResponse before we've sent it any data, postpone calling
+ ResourceLoader::didReceiveResponse until we've begun to receive data via the QLPreviewConverter delegate. At
+ that point -[QLPreviewConverter previewResponse] will have the correct MIME type and we can call didReceiveResponse.
+
+ No new tests. QuickLook is not testable from WebKit.
+
+ * platform/network/ios/QuickLook.mm:
+ (-[WebResourceLoaderQuickLookDelegate connection:didReceiveDataArray:]): If didReceiveResponse has yet to be
+ called, call it now with QuickLookHandle::nsResponse().
+ (-[WebResourceLoaderQuickLookDelegate connection:didReceiveData:lengthReceived:]): Ditto.
+ (-[WebResourceLoaderQuickLookDelegate connection:didFailWithError:]): Ditto.
+ (-[WebResourceLoaderQuickLookDelegate connectionDidFinishLoading:]): Assert that didReceiveResponse has been called.
+ (-[WebResourceLoaderQuickLookDelegate clearHandle]): Cleared the raw pointer to QuickLookHandle.
+ (WebCore::QuickLookHandle::create): Pointed WebResourceLoaderQuickLookDelegate's quickLookHandle property to
+ the newly created QuickLookHandle.
+
</ins><span class="cx"> 2014-08-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172025. <rdar://problem/17715503>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformnetworkiosQuickLookmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/network/ios/QuickLook.mm (172229 => 172230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/network/ios/QuickLook.mm 2014-08-07 19:55:31 UTC (rev 172229)
+++ branches/safari-600.1-branch/Source/WebCore/platform/network/ios/QuickLook.mm 2014-08-07 20:01:15 UTC (rev 172230)
</span><span class="lines">@@ -323,7 +323,9 @@
</span><span class="cx">
</span><span class="cx"> @interface WebResourceLoaderQuickLookDelegate : NSObject <NSURLConnectionDelegate> {
</span><span class="cx"> RefPtr<ResourceLoader> _resourceLoader;
</span><ins>+ BOOL _hasSentDidReceiveResponse;
</ins><span class="cx"> }
</span><ins>+@property (nonatomic) QuickLookHandle* quickLookHandle;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebResourceLoaderQuickLookDelegate
</span><span class="lines">@@ -344,6 +346,12 @@
</span><span class="cx"> UNUSED_PARAM(connection);
</span><span class="cx"> if (!_resourceLoader)
</span><span class="cx"> return;
</span><ins>+
+ if (!_hasSentDidReceiveResponse && _quickLookHandle) {
+ _hasSentDidReceiveResponse = YES;
+ _resourceLoader->didReceiveResponse(_quickLookHandle->nsResponse());
+ }
+
</ins><span class="cx"> _resourceLoader->didReceiveDataArray(reinterpret_cast<CFArrayRef>(dataArray));
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -353,7 +361,12 @@
</span><span class="cx"> UNUSED_PARAM(connection);
</span><span class="cx"> if (!_resourceLoader)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
+ if (!_hasSentDidReceiveResponse && _quickLookHandle) {
+ _hasSentDidReceiveResponse = YES;
+ _resourceLoader->didReceiveResponse(_quickLookHandle->nsResponse());
+ }
+
</ins><span class="cx"> // QuickLook code sends us a nil data at times. The check below is the same as the one in
</span><span class="cx"> // ResourceHandleMac.cpp added for a different bug.
</span><span class="cx"> if (![data length])
</span><span class="lines">@@ -366,20 +379,27 @@
</span><span class="cx"> UNUSED_PARAM(connection);
</span><span class="cx"> if (!_resourceLoader)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
+ ASSERT(_hasSentDidReceiveResponse);
</ins><span class="cx"> _resourceLoader->didFinishLoading(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(connection);
</span><del>-
</del><ins>+
+ if (!_hasSentDidReceiveResponse && _quickLookHandle) {
+ _hasSentDidReceiveResponse = YES;
+ _resourceLoader->didReceiveResponse(_quickLookHandle->nsResponse());
+ }
+
</ins><span class="cx"> _resourceLoader->didFail(ResourceError(error));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)clearHandle
</span><span class="cx"> {
</span><span class="cx"> _resourceLoader = nullptr;
</span><ins>+ _quickLookHandle = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -465,6 +485,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<WebResourceLoaderQuickLookDelegate> delegate = adoptNS([[WebResourceLoaderQuickLookDelegate alloc] initWithResourceLoader:loader]);
</span><span class="cx"> std::unique_ptr<QuickLookHandle> quickLookHandle(new QuickLookHandle([loader->originalRequest().nsURLRequest(DoNotUpdateHTTPBody) URL], nil, response, delegate.get()));
</span><ins>+ [delegate setQuickLookHandle:quickLookHandle.get()];
</ins><span class="cx"> loader->didCreateQuickLookHandle(*quickLookHandle);
</span><span class="cx"> return WTF::move(quickLookHandle);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (172229 => 172230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-07 19:55:31 UTC (rev 172229)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-07 20:01:15 UTC (rev 172230)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-07 Dana Burkart <dburkart@apple.com>
+
+ Merge r172035. <rdar://problem/17869353>
+
+ 2014-08-04 Andy Estes <aestes@apple.com>
+
+ [iOS] The raw bytes of an iWork document's PDF preview are displayed rather than the PDF itself
+ https://bugs.webkit.org/show_bug.cgi?id=135596
+
+ Reviewed by David Kilzer.
+
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo): If the response will be handled by
+ QuickLook, do not call ResourceLoader::didReceiveResponse. It will be called later by
+ WebResourceLoaderQuickLookDelegate once converted data is received.
+
</ins><span class="cx"> 2014-08-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172104
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (172229 => 172230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-08-07 19:55:31 UTC (rev 172229)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-08-07 20:01:15 UTC (rev 172230)
</span><span class="lines">@@ -110,12 +110,6 @@
</span><span class="cx">
</span><span class="cx"> ResourceResponse responseCopy(response);
</span><span class="cx">
</span><del>-#if USE(QUICK_LOOK)
- m_quickLookHandle = QuickLookHandle::create(resourceLoader(), response.nsURLResponse());
- if (m_quickLookHandle)
- responseCopy = ResourceResponse(m_quickLookHandle->nsResponse());
-#endif
-
</del><span class="cx"> // FIXME: This should use CertificateInfo to avoid the platform ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=124724.
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> responseCopy.setCertificateChain(certificateInfo.certificateChain());
</span><span class="lines">@@ -123,10 +117,19 @@
</span><span class="cx"> responseCopy.setSoupMessageCertificate(certificateInfo.certificate());
</span><span class="cx"> responseCopy.setSoupMessageTLSErrors(certificateInfo.tlsErrors());
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> if (m_coreLoader->documentLoader()->applicationCacheHost()->maybeLoadFallbackForResponse(m_coreLoader.get(), responseCopy))
</span><span class="cx"> return;
</span><del>- m_coreLoader->didReceiveResponse(responseCopy);
</del><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+ // Refrain from calling didReceiveResponse if QuickLook will convert this response, since the MIME type of the
+ // converted resource isn't yet known. WebResourceLoaderQuickLookDelegate will later call didReceiveResponse upon
+ // receiving the converted data.
+ m_quickLookHandle = QuickLookHandle::create(resourceLoader(), responseCopy.nsURLResponse());
+ if (!m_quickLookHandle)
+#endif
+ m_coreLoader->didReceiveResponse(responseCopy);
+
</ins><span class="cx"> // If m_coreLoader becomes null as a result of the didReceiveResponse callback, we can't use the send function().
</span><span class="cx"> if (!m_coreLoader)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>