<!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>[167188] 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/167188">167188</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-04-12 14:06:17 -0700 (Sat, 12 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Move QuickLookHandle from ResourceLoader to WebResourceLoader
https://bugs.webkit.org/show_bug.cgi?id=131580
Reviewed by Darin Adler.
There's no need to bloat WebKit1's ResourceLoader with a pointer that
only WebKit2's WebResourceLoader cares about.
Source/WebCore:
* loader/ResourceLoader.h:
(WebCore::ResourceLoader::quickLookHandle): Deleted.
(WebCore::ResourceLoader::setQuickLookHandle): Deleted.
Source/WebKit2:
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):
(WebKit::WebResourceLoader::didReceiveData):
(WebKit::WebResourceLoader::didFinishResourceLoad):
(WebKit::WebResourceLoader::didFailResourceLoad):
* WebProcess/Network/WebResourceLoader.h:
* WebProcess/ios/WebResourceLoaderIOS.mm:
(WebKit::WebResourceLoader::setUpQuickLookHandleIfNeeded):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoaderh">trunk/Source/WebCore/loader/ResourceLoader.h</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>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessiosWebResourceLoaderIOSmm">trunk/Source/WebKit2/WebProcess/ios/WebResourceLoaderIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167187 => 167188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-12 20:41:41 UTC (rev 167187)
+++ trunk/Source/WebCore/ChangeLog 2014-04-12 21:06:17 UTC (rev 167188)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-12 Andy Estes <aestes@apple.com>
+
+ [iOS] Move QuickLookHandle from ResourceLoader to WebResourceLoader
+ https://bugs.webkit.org/show_bug.cgi?id=131580
+
+ Reviewed by Darin Adler.
+
+ There's no need to bloat WebKit1's ResourceLoader with a pointer that
+ only WebKit2's WebResourceLoader cares about.
+
+ * loader/ResourceLoader.h:
+ (WebCore::ResourceLoader::quickLookHandle): Deleted.
+ (WebCore::ResourceLoader::setQuickLookHandle): Deleted.
+
</ins><span class="cx"> 2014-04-12 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Cleanup AccessibilityObject::getAttribute
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.h (167187 => 167188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.h 2014-04-12 20:41:41 UTC (rev 167187)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2014-04-12 21:06:17 UTC (rev 167188)
</span><span class="lines">@@ -36,10 +36,6 @@
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><del>-#if USE(QUICK_LOOK)
-#include "QuickLook.h"
-#endif
-
</del><span class="cx"> namespace WTF {
</span><span class="cx"> class SchedulePair;
</span><span class="cx"> }
</span><span class="lines">@@ -163,11 +159,6 @@
</span><span class="cx">
</span><span class="cx"> void setDataBufferingPolicy(DataBufferingPolicy);
</span><span class="cx">
</span><del>-#if USE(QUICK_LOOK)
- QuickLookHandle* quickLookHandle() const { return m_quickLookHandle.get(); }
- void setQuickLookHandle(PassOwnPtr<QuickLookHandle> handle) { m_quickLookHandle = handle; }
-#endif
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void schedule(WTF::SchedulePair&);
</span><span class="cx"> void unschedule(WTF::SchedulePair&);
</span><span class="lines">@@ -221,9 +212,6 @@
</span><span class="cx"> bool m_defersLoading;
</span><span class="cx"> ResourceRequest m_deferredRequest;
</span><span class="cx"> ResourceLoaderOptions m_options;
</span><del>-#if USE(QUICK_LOOK)
- OwnPtr<QuickLookHandle> m_quickLookHandle;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline const ResourceResponse& ResourceLoader::response() const
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167187 => 167188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-12 20:41:41 UTC (rev 167187)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-12 21:06:17 UTC (rev 167188)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-04-12 Andy Estes <aestes@apple.com>
+
+ [iOS] Move QuickLookHandle from ResourceLoader to WebResourceLoader
+ https://bugs.webkit.org/show_bug.cgi?id=131580
+
+ Reviewed by Darin Adler.
+
+ There's no need to bloat WebKit1's ResourceLoader with a pointer that
+ only WebKit2's WebResourceLoader cares about.
+
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):
+ (WebKit::WebResourceLoader::didReceiveData):
+ (WebKit::WebResourceLoader::didFinishResourceLoad):
+ (WebKit::WebResourceLoader::didFailResourceLoad):
+ * WebProcess/Network/WebResourceLoader.h:
+ * WebProcess/ios/WebResourceLoaderIOS.mm:
+ (WebKit::WebResourceLoader::setUpQuickLookHandleIfNeeded):
+
</ins><span class="cx"> 2014-04-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Crashes when copying or pasting huge images
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (167187 => 167188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-04-12 20:41:41 UTC (rev 167187)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-04-12 21:06:17 UTC (rev 167188)
</span><span class="lines">@@ -109,8 +109,8 @@
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> setUpQuickLookHandleIfNeeded(response);
</span><del>- if (QuickLookHandle* quickLookHandle = m_coreLoader->quickLookHandle())
- responseCopy = ResourceResponse(quickLookHandle->nsResponse());
</del><ins>+ if (m_quickLookHandle)
+ responseCopy = ResourceResponse(m_quickLookHandle->nsResponse());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><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="lines">@@ -135,9 +135,9 @@
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didReceiveData of size %i for '%s'", (int)data.size(), m_coreLoader->url().string().utf8().data());
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- if (QuickLookHandle* quickLookHandle = m_coreLoader->quickLookHandle()) {
</del><ins>+ if (m_quickLookHandle) {
</ins><span class="cx"> RetainPtr<CFDataRef> rawData = adoptCF(CFDataCreateWithBytesNoCopy(0, data.data(), data.size(), kCFAllocatorNull));
</span><del>- if (quickLookHandle->didReceiveData(rawData.get()))
</del><ins>+ if (m_quickLookHandle->didReceiveData(rawData.get()))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -149,8 +149,7 @@
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didFinishResourceLoad for '%s'", m_coreLoader->url().string().utf8().data());
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- QuickLookHandle* quickLookHandle = resourceLoader()->quickLookHandle();
- if (quickLookHandle && quickLookHandle->didFinishLoading())
</del><ins>+ if (m_quickLookHandle && m_quickLookHandle->didFinishLoading())
</ins><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx"> m_coreLoader->didFinishLoading(finishTime);
</span><span class="lines">@@ -161,8 +160,8 @@
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didFailResourceLoad for '%s'", m_coreLoader->url().string().utf8().data());
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- if (QuickLookHandle *quickLookHandle = resourceLoader()->quickLookHandle())
- quickLookHandle->didFail();
</del><ins>+ if (m_quickLookHandle)
+ m_quickLookHandle->didFail();
</ins><span class="cx"> #endif
</span><span class="cx"> m_coreLoader->didFail(error);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h (167187 => 167188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2014-04-12 20:41:41 UTC (rev 167187)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2014-04-12 21:06:17 UTC (rev 167188)
</span><span class="lines">@@ -35,6 +35,10 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+#include <WebCore/QuickLook.h>
+#endif
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx"> class DataReference;
</span><span class="cx"> }
</span><span class="lines">@@ -90,6 +94,8 @@
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> void setUpQuickLookHandleIfNeeded(const WebCore::ResourceResponse&);
</span><ins>+
+ OwnPtr<WebCore::QuickLookHandle> m_quickLookHandle;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::ResourceLoader> m_coreLoader;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessiosWebResourceLoaderIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ios/WebResourceLoaderIOS.mm (167187 => 167188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ios/WebResourceLoaderIOS.mm 2014-04-12 20:41:41 UTC (rev 167187)
+++ trunk/Source/WebKit2/WebProcess/ios/WebResourceLoaderIOS.mm 2014-04-12 21:06:17 UTC (rev 167188)
</span><span class="lines">@@ -102,11 +102,8 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceLoader::setUpQuickLookHandleIfNeeded(const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- ResourceLoader *coreLoader = resourceLoader();
</del><span class="cx"> RetainPtr<WKWebResourceQuickLookDelegate> delegate = adoptNS([[WKWebResourceQuickLookDelegate alloc] initWithWebResourceLoader:this]);
</span><del>- OwnPtr<QuickLookHandle> quickLookHandle = QuickLookHandle::create(coreLoader, response.nsURLResponse(), delegate.get());
- if (quickLookHandle)
- coreLoader->setQuickLookHandle(quickLookHandle.release());
</del><ins>+ m_quickLookHandle = QuickLookHandle::create(resourceLoader(), response.nsURLResponse(), delegate.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>