<!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>[213182] 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/213182">213182</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2017-02-28 15:18:12 -0800 (Tue, 28 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Getting QLPreviewProtocol slows down first navigation in Web process
https://bugs.webkit.org/show_bug.cgi?id=168940
<rdar://problem/29468999>
Reviewed by Simon Fraser.
No new tests, just a performance improvement.
* loader/DocumentLoader.cpp:
(WebCore::isRemoteWebArchive):
* loader/PolicyChecker.cpp:
(WebCore::PolicyChecker::checkNavigationPolicy):
* loader/ResourceLoadNotifier.cpp:
(WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
Make use of isQuickLookPreviewURL.
* loader/ios/QuickLook.h:
* loader/ios/QuickLook.mm:
(WebCore::isQuickLookPreviewURL):
Add isQuickLookPreviewURL, which first early-returns if the protocol
of the URL is a well-known protocol, and then falls back to loading QuickLook.
In a microbenchmark this is a 30-40% improvement in total time spent
loading an empty HTML document (wall-clock time between loadHTMLString
and didFinishNavigation).
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::scheduleLoad):
Make use of isQuickLookPreviewURL.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderPolicyCheckercpp">trunk/Source/WebCore/loader/PolicyChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadNotifiercpp">trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderiosQuickLookh">trunk/Source/WebCore/loader/ios/QuickLook.h</a></li>
<li><a href="#trunkSourceWebCoreloaderiosQuickLookmm">trunk/Source/WebCore/loader/ios/QuickLook.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213181 => 213182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-28 23:08:28 UTC (rev 213181)
+++ trunk/Source/WebCore/ChangeLog 2017-02-28 23:18:12 UTC (rev 213182)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2017-02-28 Tim Horton <timothy_horton@apple.com>
+
+ [iOS] Getting QLPreviewProtocol slows down first navigation in Web process
+ https://bugs.webkit.org/show_bug.cgi?id=168940
+ <rdar://problem/29468999>
+
+ Reviewed by Simon Fraser.
+
+ No new tests, just a performance improvement.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::isRemoteWebArchive):
+ * loader/PolicyChecker.cpp:
+ (WebCore::PolicyChecker::checkNavigationPolicy):
+ * loader/ResourceLoadNotifier.cpp:
+ (WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
+ Make use of isQuickLookPreviewURL.
+
+ * loader/ios/QuickLook.h:
+ * loader/ios/QuickLook.mm:
+ (WebCore::isQuickLookPreviewURL):
+ Add isQuickLookPreviewURL, which first early-returns if the protocol
+ of the URL is a well-known protocol, and then falls back to loading QuickLook.
+
+ In a microbenchmark this is a 30-40% improvement in total time spent
+ loading an empty HTML document (wall-clock time between loadHTMLString
+ and didFinishNavigation).
+
</ins><span class="cx"> 2017-02-28 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add Geolocation and DeviceOrientation to features.json
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (213181 => 213182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2017-02-28 23:08:28 UTC (rev 213181)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2017-02-28 23:18:12 UTC (rev 213182)
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- if (response.url().protocolIs(QLPreviewProtocol()))
</del><ins>+ if (isQuickLookPreviewURL(response.url()))
</ins><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPolicyCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PolicyChecker.cpp (213181 => 213182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PolicyChecker.cpp 2017-02-28 23:08:28 UTC (rev 213181)
+++ trunk/Source/WebCore/loader/PolicyChecker.cpp 2017-02-28 23:18:12 UTC (rev 213182)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> // Always allow QuickLook-generated URLs based on the protocol scheme.
</span><del>- if (!request.isNull() && request.url().protocolIs(QLPreviewProtocol())) {
</del><ins>+ if (!request.isNull() && isQuickLookPreviewURL(request.url())) {
</ins><span class="cx"> continueAfterNavigationPolicy(PolicyUse);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadNotifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp (213181 => 213182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2017-02-28 23:08:28 UTC (rev 213181)
+++ trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2017-02-28 23:18:12 UTC (rev 213182)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> // Always allow QuickLook-generated URLs based on the protocol scheme.
</span><del>- if (!request.isNull() && request.url().protocolIs(QLPreviewProtocol()))
</del><ins>+ if (!request.isNull() && isQuickLookPreviewURL(request.url()))
</ins><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderiosQuickLookh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ios/QuickLook.h (213181 => 213182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ios/QuickLook.h 2017-02-28 23:08:28 UTC (rev 213181)
+++ trunk/Source/WebCore/loader/ios/QuickLook.h 2017-02-28 23:18:12 UTC (rev 213182)
</span><span class="lines">@@ -44,11 +44,13 @@
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><span class="cx"> class SharedBuffer;
</span><ins>+class URL;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT NSSet *QLPreviewGetSupportedMIMETypesSet();
</span><span class="cx"> WEBCORE_EXPORT void removeQLPreviewConverterForURL(NSURL *);
</span><span class="cx"> WEBCORE_EXPORT RetainPtr<NSURLRequest> registerQLPreviewConverterIfNeeded(NSURL *, NSString *mimeType, NSData *);
</span><span class="cx"> WEBCORE_EXPORT const char* QLPreviewProtocol();
</span><ins>+WEBCORE_EXPORT bool isQuickLookPreviewURL(const URL&);
</ins><span class="cx"> WEBCORE_EXPORT NSString *createTemporaryFileForQuickLook(NSString *fileName);
</span><span class="cx">
</span><span class="cx"> class QuickLookHandle {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderiosQuickLookmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ios/QuickLook.mm (213181 => 213182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ios/QuickLook.mm 2017-02-28 23:08:28 UTC (rev 213181)
+++ trunk/Source/WebCore/loader/ios/QuickLook.mm 2017-02-28 23:18:12 UTC (rev 213182)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #import "ResourceError.h"
</span><span class="cx"> #import "ResourceLoader.h"
</span><span class="cx"> #import "ResourceRequest.h"
</span><ins>+#import "SchemeRegistry.h"
</ins><span class="cx"> #import "SharedBuffer.h"
</span><span class="cx"> #import <WebCore/NetworkLoadMetrics.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -123,6 +124,14 @@
</span><span class="cx"> return previewProtocol.get().data();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebCore::isQuickLookPreviewURL(const URL& url)
+{
+ // Use some known protocols as a short-cut to avoid loading the QuickLook framework.
+ if (url.protocolIsInHTTPFamily() || url.isBlankURL() || url.protocolIsBlob() || url.protocolIsData() || SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol().toString()))
+ return NO;
+ return url.protocolIs(QLPreviewProtocol());
+}
+
</ins><span class="cx"> static RefPtr<QuickLookHandleClient>& testingClient()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<RefPtr<QuickLookHandleClient>> testingClient;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213181 => 213182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-28 23:08:28 UTC (rev 213181)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-28 23:18:12 UTC (rev 213182)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-28 Tim Horton <timothy_horton@apple.com>
+
+ [iOS] Getting QLPreviewProtocol slows down first navigation in Web process
+ https://bugs.webkit.org/show_bug.cgi?id=168940
+ <rdar://problem/29468999>
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoad):
+ Make use of isQuickLookPreviewURL.
+
</ins><span class="cx"> 2017-02-28 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix API test regression(s):
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (213181 => 213182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2017-02-28 23:08:28 UTC (rev 213181)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2017-02-28 23:18:12 UTC (rev 213182)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- if (resourceLoader.request().url().protocolIs(QLPreviewProtocol())) {
</del><ins>+ if (isQuickLookPreviewURL(resourceLoader.request().url())) {
</ins><span class="cx"> LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as a QuickLook resource.", resourceLoader.url().string().utf8().data());
</span><span class="cx"> RELEASE_LOG_IF_ALLOWED(resourceLoader, "scheduleLoad: URL will be handled as a QuickLook resource (frame = %p, resourceID = %" PRIu64 ")", resourceLoader.frame(), identifier);
</span><span class="cx"> startLocalLoad(resourceLoader);
</span></span></pre>
</div>
</div>
</body>
</html>