<!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>[172761] 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/172761">172761</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 14:31:59 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172502">r172502</a>. <rdar://problem/18022784></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="#branchessafari6001branchSourceWebCoreplatformSharedBufferh">branches/safari-600.1-branch/Source/WebCore/platform/SharedBuffer.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformmacSharedBufferMacmm">branches/safari-600.1-branch/Source/WebCore/platform/mac/SharedBufferMac.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm">branches/safari-600.1-branch/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm</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 (172760 => 172761)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-19 21:28:41 UTC (rev 172760)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-19 21:31:59 UTC (rev 172761)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-08-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172502
+
+ 2014-08-12 Pratik Solanki <psolanki@apple.com>
+
+ Cached file backed resources don't make it to the Web Process when NETWORK_CFDATA_ARRAY_CALLBACK is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=135727
+ <rdar://problem/17947880>
+
+ Reviewed by Darin Adler.
+
+ Add SharedBuffer::existingCFData() which returns CFDataRef if it has one. Refactor
+ this code out of createCFData().
+
+ * WebCore.exp.in:
+ * platform/SharedBuffer.h:
+ * platform/mac/SharedBufferMac.mm:
+ (WebCore::SharedBuffer::existingCFData): Added.
+ (WebCore::SharedBuffer::createCFData):
+
+2014-08-19 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172481
</span><span class="cx">
</span><span class="cx"> 2014-08-11 Roger Fong <roger_fong@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 (172760 => 172761)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in 2014-08-19 21:28:41 UTC (rev 172760)
+++ branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in 2014-08-19 21:31:59 UTC (rev 172761)
</span><span class="lines">@@ -242,6 +242,7 @@
</span><span class="cx"> __ZN7WebCore12SharedBuffer11adoptVectorERN3WTF6VectorIcLm0ENS1_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore12SharedBuffer12createCFDataEv
</span><span class="cx"> __ZN7WebCore12SharedBuffer12createNSDataEv
</span><ins>+__ZN7WebCore12SharedBuffer14existingCFDataEv
</ins><span class="cx"> __ZN7WebCore12SharedBuffer24createWithContentsOfFileERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore12SharedBuffer6appendEPKcj
</span><span class="cx"> __ZN7WebCore12SharedBuffer6appendEPS0_
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/SharedBuffer.h (172760 => 172761)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/SharedBuffer.h 2014-08-19 21:28:41 UTC (rev 172760)
+++ branches/safari-600.1-branch/Source/WebCore/platform/SharedBuffer.h 2014-08-19 21:31:59 UTC (rev 172761)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> RetainPtr<CFDataRef> createCFData();
</span><ins>+ CFDataRef existingCFData();
</ins><span class="cx"> static PassRefPtr<SharedBuffer> wrapCFData(CFDataRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformmacSharedBufferMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/mac/SharedBufferMac.mm (172760 => 172761)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/mac/SharedBufferMac.mm 2014-08-19 21:28:41 UTC (rev 172760)
+++ branches/safari-600.1-branch/Source/WebCore/platform/mac/SharedBufferMac.mm 2014-08-19 21:31:59 UTC (rev 172761)
</span><span class="lines">@@ -128,16 +128,24 @@
</span><span class="cx"> return adoptNS((NSData *)createCFData().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RetainPtr<CFDataRef> SharedBuffer::createCFData()
</del><ins>+CFDataRef SharedBuffer::existingCFData()
</ins><span class="cx"> {
</span><span class="cx"> if (m_cfData)
</span><del>- return m_cfData;
</del><ins>+ return m_cfData.get();
</ins><span class="cx">
</span><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><span class="cx"> if (m_dataArray.size() == 1)
</span><del>- return m_dataArray.at(0);
</del><ins>+ return m_dataArray.at(0).get();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ return nullptr;
+}
+
+RetainPtr<CFDataRef> SharedBuffer::createCFData()
+{
+ if (CFDataRef cfData = existingCFData())
+ return cfData;
+
</ins><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> if (isMemoryMapped())
</span><span class="cx"> return adoptCF((CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithMemoryMappedSharedBuffer:*this]).leakRef());
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (172760 => 172761)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-19 21:28:41 UTC (rev 172760)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-19 21:31:59 UTC (rev 172761)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-08-19 Dana Burkart <dburkart@apple.com>
+
+ Merge r172502
+
+ 2014-08-12 Pratik Solanki <psolanki@apple.com>
+
+ Cached file backed resources don't make it to the Web Process when NETWORK_CFDATA_ARRAY_CALLBACK is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=135727
+ <rdar://problem/17947880>
+
+ Reviewed by Darin Adler.
+
+ tryGetShareableHandleFromSharedBuffer() assumed that we have a file backed resource only if
+ we had a CFDataRef (platformData()) in SharedBuffer. This is wrong when we use the data
+ array callbacks since the file backed buffer could be in the data array. Instead of relying
+ on hasPlatformData(), explicitly ask the SharedBuffer to give us a CFDataRef if it has one
+ so that SharedBuffer can take care of the data array case.
+
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+ (WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):
+
</ins><span class="cx"> 2014-08-18 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172680
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (172760 => 172761)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2014-08-19 21:28:41 UTC (rev 172760)
+++ branches/safari-600.1-branch/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2014-08-19 21:31:59 UTC (rev 172761)
</span><span class="lines">@@ -93,14 +93,14 @@
</span><span class="cx"> if (!cache)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!buffer->hasPlatformData())
</del><ins>+ CFDataRef data = buffer->existingCFData();
+ if (!data)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- RetainPtr<CFDataRef> data = buffer->createCFData();
- if (_CFURLCacheIsResponseDataMemMapped(cache, data.get()) == kCFBooleanFalse)
</del><ins>+ if (_CFURLCacheIsResponseDataMemMapped(cache, data) == kCFBooleanFalse)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- tryGetShareableHandleFromCFData(handle, data.get());
</del><ins>+ tryGetShareableHandleFromCFData(handle, data);
</ins><span class="cx"> }
</span><span class="cx"> #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>