<!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>[174889] trunk/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/174889">174889</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-10-20 10:17:32 -0700 (Mon, 20 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid unnecessary NSURLResponse construction for QuickLook on iOS
https://bugs.webkit.org/show_bug.cgi?id=137876
Reviewed by Andy Estes.
Source/WebCore:
QuickLook specific code path creates NSURLResponse in the web process for every response.
It is rarely needed so this is unnecessary work.
* WebCore.exp.in:
* platform/network/ios/QuickLook.h:
* platform/network/ios/QuickLook.mm:
(WebCore::isMainResourceLoader):
(WebCore::QuickLookHandle::shouldCreateForMIMEType):
Separate function for testing if QuickLookHandle is needed.
(WebCore::QuickLookHandle::create):
Switch the interface to take ResourceResponse.
Source/WebKit2:
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::didReceiveResponse):
Switch to the modified QuickLookHandle interface that does not need NSURLResponse.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkiosQuickLookh">trunk/Source/WebCore/platform/network/ios/QuickLook.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkiosQuickLookmm">trunk/Source/WebCore/platform/network/ios/QuickLook.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174888 => 174889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-20 17:03:26 UTC (rev 174888)
+++ trunk/Source/WebCore/ChangeLog 2014-10-20 17:17:32 UTC (rev 174889)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-10-19 Antti Koivisto <antti@apple.com>
+
+ Avoid unnecessary NSURLResponse construction for QuickLook on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=137876
+
+ Reviewed by Andy Estes.
+
+ QuickLook specific code path creates NSURLResponse in the web process for every response.
+ It is rarely needed so this is unnecessary work.
+
+ * WebCore.exp.in:
+ * platform/network/ios/QuickLook.h:
+ * platform/network/ios/QuickLook.mm:
+ (WebCore::isMainResourceLoader):
+ (WebCore::QuickLookHandle::shouldCreateForMIMEType):
+
+ Separate function for testing if QuickLookHandle is needed.
+
+ (WebCore::QuickLookHandle::create):
+
+ Switch the interface to take ResourceResponse.
+
</ins><span class="cx"> 2014-10-20 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (174888 => 174889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-10-20 17:03:26 UTC (rev 174888)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-10-20 17:17:32 UTC (rev 174889)
</span><span class="lines">@@ -3334,7 +3334,8 @@
</span><span class="cx"> __ZN7WebCore15QuickLookHandle10nsResponseEv
</span><span class="cx"> __ZN7WebCore15QuickLookHandle14didReceiveDataEPK8__CFData
</span><span class="cx"> __ZN7WebCore15QuickLookHandle16didFinishLoadingEv
</span><del>-__ZN7WebCore15QuickLookHandle6createEPNS_14ResourceLoaderEP13NSURLResponse
</del><ins>+__ZN7WebCore15QuickLookHandle23shouldCreateForMIMETypeERKN3WTF6StringE
+__ZN7WebCore15QuickLookHandle6createERNS_14ResourceLoaderERKNS_16ResourceResponseE
</ins><span class="cx"> __ZN7WebCore15QuickLookHandle7didFailEv
</span><span class="cx"> __ZN7WebCore15QuickLookHandleD1Ev
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler26maybeLoadQuickLookResourceERNS_14ResourceLoaderE
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosQuickLookh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/QuickLook.h (174888 => 174889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ios/QuickLook.h 2014-10-20 17:03:26 UTC (rev 174888)
+++ trunk/Source/WebCore/platform/network/ios/QuickLook.h 2014-10-20 17:17:32 UTC (rev 174889)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> class QuickLookHandleClient;
</span><span class="cx"> class ResourceHandle;
</span><span class="cx"> class ResourceLoader;
</span><ins>+class ResourceResponse;
</ins><span class="cx"> class SynchronousResourceHandleCFURLConnectionDelegate;
</span><span class="cx">
</span><span class="cx"> Class QLPreviewConverterClass();
</span><span class="lines">@@ -82,11 +83,15 @@
</span><span class="cx"> class QuickLookHandle {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(QuickLookHandle);
</span><span class="cx"> public:
</span><ins>+ WEBCORE_EXPORT static bool shouldCreateForMIMEType(const String&);
+
</ins><span class="cx"> static std::unique_ptr<QuickLookHandle> create(ResourceHandle*, NSURLConnection *, NSURLResponse *, id delegate);
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> static std::unique_ptr<QuickLookHandle> create(ResourceHandle*, SynchronousResourceHandleCFURLConnectionDelegate*, CFURLResponseRef);
</span><span class="cx"> #endif
</span><del>- WEBCORE_EXPORT static std::unique_ptr<QuickLookHandle> create(ResourceLoader*, NSURLResponse *);
</del><ins>+ // FIXME: Use of ResourceLoader here is a platform violation.
+ WEBCORE_EXPORT static std::unique_ptr<QuickLookHandle> create(ResourceLoader&, const ResourceResponse&);
+
</ins><span class="cx"> WEBCORE_EXPORT ~QuickLookHandle();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool didReceiveDataArray(CFArrayRef);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosQuickLookmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/QuickLook.mm (174888 => 174889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2014-10-20 17:03:26 UTC (rev 174888)
+++ trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2014-10-20 17:17:32 UTC (rev 174889)
</span><span class="lines">@@ -488,21 +488,19 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static inline bool isMainResourceLoader(ResourceLoader* loader)
</del><ins>+bool QuickLookHandle::shouldCreateForMIMEType(const String& mimeType)
</ins><span class="cx"> {
</span><del>- return loader->documentLoader()->mainResourceLoader() == loader;
</del><ins>+ return [WebCore::QLPreviewGetSupportedMIMETypesSet() containsObject:mimeType];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<QuickLookHandle> QuickLookHandle::create(ResourceLoader* loader, NSURLResponse *response)
</del><ins>+std::unique_ptr<QuickLookHandle> QuickLookHandle::create(ResourceLoader& loader, const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- ASSERT_ARG(loader, loader);
- if (!isMainResourceLoader(loader) || ![WebCore::QLPreviewGetSupportedMIMETypesSet() containsObject:[response MIMEType]])
- return nullptr;
</del><ins>+ ASSERT(shouldCreateForMIMEType(response.mimeType()));
</ins><span class="cx">
</span><del>- RetainPtr<WebResourceLoaderQuickLookDelegate> delegate = adoptNS([[WebResourceLoaderQuickLookDelegate alloc] initWithResourceLoader:loader]);
- std::unique_ptr<QuickLookHandle> quickLookHandle(new QuickLookHandle([loader->originalRequest().nsURLRequest(DoNotUpdateHTTPBody) URL], nil, response, delegate.get()));
</del><ins>+ RetainPtr<WebResourceLoaderQuickLookDelegate> delegate = adoptNS([[WebResourceLoaderQuickLookDelegate alloc] initWithResourceLoader:&loader]);
+ std::unique_ptr<QuickLookHandle> quickLookHandle(new QuickLookHandle([loader.originalRequest().nsURLRequest(DoNotUpdateHTTPBody) URL], nil, response.nsURLResponse(), delegate.get()));
</ins><span class="cx"> [delegate setQuickLookHandle:quickLookHandle.get()];
</span><del>- loader->didCreateQuickLookHandle(*quickLookHandle);
</del><ins>+ loader.didCreateQuickLookHandle(*quickLookHandle);
</ins><span class="cx"> return WTF::move(quickLookHandle);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174888 => 174889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-20 17:03:26 UTC (rev 174888)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-20 17:17:32 UTC (rev 174889)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-19 Antti Koivisto <antti@apple.com>
+
+ Avoid unnecessary NSURLResponse construction for QuickLook on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=137876
+
+ Reviewed by Andy Estes.
+
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::didReceiveResponse):
+
+ Switch to the modified QuickLookHandle interface that does not need NSURLResponse.
+
</ins><span class="cx"> 2014-10-16 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Capture WKActionSheetAssistant's interaction with WKContentView in a @protocol
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (174888 => 174889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-10-20 17:03:26 UTC (rev 174888)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-10-20 17:17:32 UTC (rev 174889)
</span><span class="lines">@@ -112,13 +112,18 @@
</span><span class="cx"> if (m_coreLoader->documentLoader()->applicationCacheHost()->maybeLoadFallbackForResponse(m_coreLoader.get(), response))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ bool shoudCallCoreLoaderDidReceiveResponse = true;
</ins><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> // Refrain from calling didReceiveResponse if QuickLook will convert this response, since the MIME type of the
</span><span class="cx"> // converted resource isn't yet known. WebResourceLoaderQuickLookDelegate will later call didReceiveResponse upon
</span><span class="cx"> // receiving the converted data.
</span><del>- m_coreLoader->documentLoader()->setQuickLookHandle(QuickLookHandle::create(resourceLoader(), response.nsURLResponse()));
- if (!m_coreLoader->documentLoader()->quickLookHandle())
</del><ins>+ bool isMainLoad = m_coreLoader->documentLoader()->mainResourceLoader() == m_coreLoader;
+ if (isMainLoad && QuickLookHandle::shouldCreateForMIMEType(response.mimeType())) {
+ m_coreLoader->documentLoader()->setQuickLookHandle(QuickLookHandle::create(*m_coreLoader, response));
+ shoudCallCoreLoaderDidReceiveResponse = false;
+ }
</ins><span class="cx"> #endif
</span><ins>+ if (shoudCallCoreLoaderDidReceiveResponse)
</ins><span class="cx"> m_coreLoader->didReceiveResponse(response);
</span><span class="cx">
</span><span class="cx"> // If m_coreLoader becomes null as a result of the didReceiveResponse callback, we can't use the send function().
</span></span></pre>
</div>
</div>
</body>
</html>