<!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>[169233] trunk/Source/WebKit2</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/169233">169233</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 17:40:23 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Send shareable resources to QuickLook if enabled
https://bugs.webkit.org/show_bug.cgi?id=133189
<rdar://problem/17003995>
Reviewed by Brady Eidson.
Like we do for didReceiveData(), we need to pass an incoming ShareableResource to QuickLook if a QuickLook
handle exists.
* Shared/ShareableResource.cpp:
(WebKit::ShareableResource::Handle::tryWrapInCFData): Return the shared resource in a CFDataRef.
(WebKit::ShareableResource::Handle::tryWrapInSharedBuffer): Implemented in terms of tryWrapInCFData().
* Shared/ShareableResource.h:
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::didReceiveResource): If a QuickLook handle exists, send the shareable resource to
it via a CFDataRef.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedShareableResourcecpp">trunk/Source/WebKit2/Shared/ShareableResource.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedShareableResourceh">trunk/Source/WebKit2/Shared/ShareableResource.h</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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169232 => 169233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-23 00:39:36 UTC (rev 169232)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-23 00:40:23 UTC (rev 169233)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-22 Andy Estes <aestes@apple.com>
+
+ [iOS] Send shareable resources to QuickLook if enabled
+ https://bugs.webkit.org/show_bug.cgi?id=133189
+ <rdar://problem/17003995>
+
+ Reviewed by Brady Eidson.
+
+ Like we do for didReceiveData(), we need to pass an incoming ShareableResource to QuickLook if a QuickLook
+ handle exists.
+
+ * Shared/ShareableResource.cpp:
+ (WebKit::ShareableResource::Handle::tryWrapInCFData): Return the shared resource in a CFDataRef.
+ (WebKit::ShareableResource::Handle::tryWrapInSharedBuffer): Implemented in terms of tryWrapInCFData().
+ * Shared/ShareableResource.h:
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::didReceiveResource): If a QuickLook handle exists, send the shareable resource to
+ it via a CFDataRef.
+
</ins><span class="cx"> 2014-05-22 Martin Hock <mhock@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Enable -apple-system- styled elements to respond to system font size changes.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableResource.cpp (169232 => 169233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableResource.cpp 2014-05-23 00:39:36 UTC (rev 169232)
+++ trunk/Source/WebKit2/Shared/ShareableResource.cpp 2014-05-23 00:40:23 UTC (rev 169233)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> return CFAllocatorCreate(kCFAllocatorDefault, &context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> ShareableResource::Handle::tryWrapInSharedBuffer() const
</del><ins>+RetainPtr<CFDataRef> ShareableResource::Handle::tryWrapInCFData() const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ShareableResource> resource = ShareableResource::create(*this);
</span><span class="cx"> if (!resource) {
</span><span class="lines">@@ -89,9 +89,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFAllocatorRef> deallocator = adoptCF(createShareableResourceDeallocator(resource.get()));
</span><del>- RetainPtr<CFDataRef> data = adoptCF(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(resource->data()), static_cast<CFIndex>(resource->size()), deallocator.get()));
</del><ins>+ return std::move(adoptCF(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(resource->data()), static_cast<CFIndex>(resource->size()), deallocator.get())));
+}
</ins><span class="cx">
</span><del>- return SharedBuffer::wrapCFData(data.get());
</del><ins>+PassRefPtr<SharedBuffer> ShareableResource::Handle::tryWrapInSharedBuffer() const
+{
+ return SharedBuffer::wrapCFData(tryWrapInCFData().get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ShareableResource> ShareableResource::create(PassRefPtr<SharedMemory> sharedMemory, unsigned offset, unsigned size)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableResource.h (169232 => 169233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableResource.h 2014-05-23 00:39:36 UTC (rev 169232)
+++ trunk/Source/WebKit2/Shared/ShareableResource.h 2014-05-23 00:40:23 UTC (rev 169233)
</span><span class="lines">@@ -33,7 +33,9 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><ins>+#include <wtf/RetainPtr.h>
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class SharedBuffer;
</span><span class="cx"> }
</span><span class="lines">@@ -54,6 +56,9 @@
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, Handle&);
</span><span class="cx">
</span><ins>+#if USE(CF)
+ RetainPtr<CFDataRef> tryWrapInCFData() const;
+#endif
</ins><span class="cx"> PassRefPtr<WebCore::SharedBuffer> tryWrapInSharedBuffer() const;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (169232 => 169233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-05-23 00:39:36 UTC (rev 169232)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-05-23 00:40:23 UTC (rev 169233)
</span><span class="lines">@@ -178,6 +178,19 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didReceiveResource for '%s'", m_coreLoader->url().string().utf8().data());
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+ if (m_quickLookHandle) {
+ RetainPtr<CFDataRef> cfBuffer = handle.tryWrapInCFData();
+ if (cfBuffer) {
+ if (m_quickLookHandle->didReceiveData(cfBuffer.get())) {
+ m_quickLookHandle->didFinishLoading();
+ return;
+ }
+ } else
+ m_quickLookHandle->didFail();
+ }
+#endif
+
</ins><span class="cx"> RefPtr<SharedBuffer> buffer = handle.tryWrapInSharedBuffer();
</span><span class="cx"> if (!buffer) {
</span><span class="cx"> LOG_ERROR("Unable to create buffer from ShareableResource sent from the network process.");
</span></span></pre>
</div>
</div>
</body>
</html>