<!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>[171441] 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/171441">171441</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-07-22 23:51:47 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171314">r171314</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreWebCoreexpin">branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreloaderResourceLoadSchedulercpp">branches/safari-600.1-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreloaderResourceLoadSchedulerh">branches/safari-600.1-branch/Source/WebCore/loader/ResourceLoadScheduler.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp">branches/safari-600.1-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.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 (171440 => 171441)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-23 06:49:12 UTC (rev 171440)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-23 06:51:47 UTC (rev 171441)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171314.
+
+ 2014-07-21 Andy Estes <aestes@apple.com>
+
+ [iOS] Handle QuickLook ResourceLoaders in the web process
+ https://bugs.webkit.org/show_bug.cgi?id=135113
+
+ Reviewed by David Kilzer.
+
+ No new tests. QuickLook is not testable from WebKit.
+
+ * WebCore.exp.in:
+ * loader/ResourceLoadScheduler.cpp:
+ (WebCore::ResourceLoadScheduler::maybeLoadQuickLookResource): Start loading the ResourceLoader if it is for a QuickLook resource.
+ * loader/ResourceLoadScheduler.h:
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171308.
</span><span class="cx">
</span><span class="cx"> 2014-07-21 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in (171440 => 171441)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in 2014-07-23 06:49:12 UTC (rev 171440)
+++ branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in 2014-07-23 06:51:47 UTC (rev 171441)
</span><span class="lines">@@ -3326,6 +3326,7 @@
</span><span class="cx"> __ZN7WebCore15QuickLookHandle6createEPNS_14ResourceLoaderEP13NSURLResponse
</span><span class="cx"> __ZN7WebCore15QuickLookHandle7didFailEv
</span><span class="cx"> __ZN7WebCore15QuickLookHandleD1Ev
</span><ins>+__ZN7WebCore21ResourceLoadScheduler26maybeLoadQuickLookResourceERNS_14ResourceLoaderE
</ins><span class="cx"> __ZN7WebCore27qlPreviewConverterUTIForURLEP5NSURL
</span><span class="cx"> __ZN7WebCore30removeQLPreviewConverterForURLEP5NSURL
</span><span class="cx"> __ZN7WebCore31createTemporaryFileForQuickLookEP8NSString
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreloaderResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp (171440 => 171441)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp 2014-07-23 06:49:12 UTC (rev 171440)
+++ branches/safari-600.1-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp 2014-07-23 06:51:47 UTC (rev 171441)
</span><span class="lines">@@ -46,6 +46,10 @@
</span><span class="cx"> #include <RuntimeApplicationChecksIOS.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+#include "QuickLook.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // Match the parallel connection count used by the networking layer.
</span><span class="lines">@@ -197,6 +201,17 @@
</span><span class="cx"> InspectorInstrumentation::didScheduleResourceRequest(loader->frameLoader() ? loader->frameLoader()->frame().document() : 0, loader->url());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+bool ResourceLoadScheduler::maybeLoadQuickLookResource(ResourceLoader& loader)
+{
+ if (!loader.request().url().protocolIs(QLPreviewProtocol()))
+ return false;
+
+ loader.start();
+ return true;
+}
+#endif
+
</ins><span class="cx"> void ResourceLoadScheduler::remove(ResourceLoader* resourceLoader)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(resourceLoader);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreloaderResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/loader/ResourceLoadScheduler.h (171440 => 171441)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/loader/ResourceLoadScheduler.h 2014-07-23 06:49:12 UTC (rev 171440)
+++ branches/safari-600.1-branch/Source/WebCore/loader/ResourceLoadScheduler.h 2014-07-23 06:51:47 UTC (rev 171441)
</span><span class="lines">@@ -77,6 +77,10 @@
</span><span class="cx">
</span><span class="cx"> void notifyDidScheduleResourceRequest(ResourceLoader*);
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+ bool maybeLoadQuickLookResource(ResourceLoader&);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> void scheduleLoad(ResourceLoader*, ResourceLoadPriority);
</span><span class="cx"> void scheduleServePendingRequests();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171440 => 171441)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 06:49:12 UTC (rev 171440)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 06:51:47 UTC (rev 171441)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171314.
+
+ 2014-07-21 Andy Estes <aestes@apple.com>
+
+ [iOS] Handle QuickLook ResourceLoaders in the web process
+ https://bugs.webkit.org/show_bug.cgi?id=135113
+
+ Reviewed by David Kilzer.
+
+ The QuickLook framework registers a NSURLProtocol to handle loading subresources of the HTML documents it
+ generates. In order for these loads to succeed, we need to start them in the same process in which QuickLook
+ generated the main resource.
+
+ * WebProcess/Network/WebResourceLoadScheduler.cpp:
+ (WebKit::WebResourceLoadScheduler::scheduleLoad):
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171303.
</span><span class="cx">
</span><span class="cx"> 2014-07-21 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (171440 => 171441)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2014-07-23 06:49:12 UTC (rev 171440)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2014-07-23 06:51:47 UTC (rev 171441)
</span><span class="lines">@@ -110,6 +110,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+ if (maybeLoadQuickLookResource(*resourceLoader)) {
+ LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be handled as a QuickLook resource.", resourceLoader->url().string().utf8().data());
+ m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
+ return;
+ }
+#endif
+
</ins><span class="cx"> LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %i", resourceLoader->url().string().utf8().data(), priority);
</span><span class="cx">
</span><span class="cx"> ContentSniffingPolicy contentSniffingPolicy = resourceLoader->shouldSniffContent() ? SniffContent : DoNotSniffContent;
</span></span></pre>
</div>
</div>
</body>
</html>