<!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>[171766] trunk/Source/WebCore</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/171766">171766</a></dd>
<dt>Author</dt> <dd>psolanki@apple.com</dd>
<dt>Date</dt> <dd>2014-07-29 14:41:36 -0700 (Tue, 29 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/171526">r171526</a>): PDF documents fail to load in WebKit1 with disk image caching enabled
https://bugs.webkit.org/show_bug.cgi?id=135359
<rdar://problem/17824645>
Reviewed by Darin Adler.
<a href="http://trac.webkit.org/projects/webkit/changeset/171526">r171526</a> broke the case where we have a memory mapped file from the DiskImageCache in the
SharedBuffer. In such a case, m_buffer is empty and createCFData() returned an
WebCoreSharedBufferData with an empty buffer.
Fix this by taking the easy route of bringing back the old code for the disk image cache
file backed case. In the long run we probably want to remove the iOS specific disk image
cache anyway.
Review also uncovered another bug in <a href="http://trac.webkit.org/projects/webkit/changeset/171526">r171526</a> where we were balancing an Objective-C alloc
with a CFRelease which is incorrect when running under GC. Fix that by using adoptNS along
with adoptCF which is what the code did before.
No new tests because the bug only occurs on device and we can't run tests on device yet.
* platform/mac/SharedBufferMac.mm:
(-[WebCoreSharedBufferData initWithDiskImageSharedBuffer:]):
(-[WebCoreSharedBufferData length]):
(-[WebCoreSharedBufferData bytes]):
(WebCore::SharedBuffer::createCFData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSharedBufferMacmm">trunk/Source/WebCore/platform/mac/SharedBufferMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171765 => 171766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-29 21:25:23 UTC (rev 171765)
+++ trunk/Source/WebCore/ChangeLog 2014-07-29 21:41:36 UTC (rev 171766)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-07-29 Pratik Solanki <psolanki@apple.com>
+
+ [iOS] REGRESSION(r171526): PDF documents fail to load in WebKit1 with disk image caching enabled
+ https://bugs.webkit.org/show_bug.cgi?id=135359
+ <rdar://problem/17824645>
+
+ Reviewed by Darin Adler.
+
+ r171526 broke the case where we have a memory mapped file from the DiskImageCache in the
+ SharedBuffer. In such a case, m_buffer is empty and createCFData() returned an
+ WebCoreSharedBufferData with an empty buffer.
+
+ Fix this by taking the easy route of bringing back the old code for the disk image cache
+ file backed case. In the long run we probably want to remove the iOS specific disk image
+ cache anyway.
+
+ Review also uncovered another bug in r171526 where we were balancing an Objective-C alloc
+ with a CFRelease which is incorrect when running under GC. Fix that by using adoptNS along
+ with adoptCF which is what the code did before.
+
+ No new tests because the bug only occurs on device and we can't run tests on device yet.
+
+ * platform/mac/SharedBufferMac.mm:
+ (-[WebCoreSharedBufferData initWithDiskImageSharedBuffer:]):
+ (-[WebCoreSharedBufferData length]):
+ (-[WebCoreSharedBufferData bytes]):
+ (WebCore::SharedBuffer::createCFData):
+
</ins><span class="cx"> 2014-07-29 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> VisitedLinkState::determineLinkState should take a reference
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSharedBufferMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SharedBufferMac.mm (171765 => 171766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SharedBufferMac.mm 2014-07-29 21:25:23 UTC (rev 171765)
+++ trunk/Source/WebCore/platform/mac/SharedBufferMac.mm 2014-07-29 21:41:36 UTC (rev 171766)
</span><span class="lines">@@ -36,10 +36,16 @@
</span><span class="cx">
</span><span class="cx"> @interface WebCoreSharedBufferData : NSData
</span><span class="cx"> {
</span><del>- RefPtr<SharedBuffer::DataBuffer> buffer;
</del><ins>+ RefPtr<SharedBuffer::DataBuffer> sharedBufferDataBuffer;
+#if ENABLE(DISK_IMAGE_CACHE)
+ RefPtr<SharedBuffer> sharedBuffer;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)initWithSharedBufferDataBuffer:(SharedBuffer::DataBuffer*)dataBuffer;
</span><ins>+#if ENABLE(DISK_IMAGE_CACHE)
+- (id)initWithMemoryMappedSharedBuffer:(SharedBuffer&)memoryMappedSharedBuffer;
+#endif
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebCoreSharedBufferData
</span><span class="lines">@@ -71,19 +77,41 @@
</span><span class="cx"> self = [super init];
</span><span class="cx">
</span><span class="cx"> if (self)
</span><del>- buffer = dataBuffer;
</del><ins>+ sharedBufferDataBuffer = dataBuffer;
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(DISK_IMAGE_CACHE)
+- (id)initWithMemoryMappedSharedBuffer:(SharedBuffer&)memoryMappedSharedBuffer
+{
+ ASSERT(memoryMappedSharedBuffer.isMemoryMapped());
+ self = [super init];
+
+ if (!self)
+ return nil;
+
+ sharedBuffer = &memoryMappedSharedBuffer;
+ return self;
+}
+#endif
+
</ins><span class="cx"> - (NSUInteger)length
</span><span class="cx"> {
</span><del>- return buffer->data.size();
</del><ins>+#if ENABLE(DISK_IMAGE_CACHE)
+ if (sharedBuffer)
+ return sharedBuffer->size();
+#endif
+ return sharedBufferDataBuffer->data.size();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (const void *)bytes
</span><span class="cx"> {
</span><del>- return reinterpret_cast<const void*>(buffer->data.data());
</del><ins>+#if ENABLE(DISK_IMAGE_CACHE)
+ if (sharedBuffer)
+ return sharedBuffer->data();
+#endif
+ return sharedBufferDataBuffer->data.data();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -110,14 +138,19 @@
</span><span class="cx"> return m_dataArray.at(0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(DISK_IMAGE_CACHE)
+ if (isMemoryMapped())
+ return adoptCF((CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithMemoryMappedSharedBuffer:*this]).leakRef());
+#endif
+
</ins><span class="cx"> data(); // Force data into m_buffer from segments or data array.
</span><span class="cx"> if (hasPurgeableBuffer()) {
</span><span class="cx"> RefPtr<SharedBuffer::DataBuffer> copiedBuffer = adoptRef(new DataBuffer);
</span><span class="cx"> copiedBuffer->data.append(data(), size());
</span><del>- return adoptCF(reinterpret_cast<CFDataRef>([[WebCoreSharedBufferData alloc] initWithSharedBufferDataBuffer:copiedBuffer.get()]));
</del><ins>+ return adoptCF((CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithSharedBufferDataBuffer:copiedBuffer.get()]).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return adoptCF(reinterpret_cast<CFDataRef>([[WebCoreSharedBufferData alloc] initWithSharedBufferDataBuffer:m_buffer.get()]));
</del><ins>+ return adoptCF((CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithSharedBufferDataBuffer:m_buffer.get()]).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& filePath)
</span></span></pre>
</div>
</div>
</body>
</html>