<!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>[202357] 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/202357">202357</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-22 16:31:42 -0700 (Wed, 22 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using PassRefPtr in ShareableResource
https://bugs.webkit.org/show_bug.cgi?id=159043
Reviewed by Alex Christensen.
Stop using PassRefPtr in ShareableResource.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::store):
* NetworkProcess/cache/NetworkCacheEntry.cpp:
(WebKit::NetworkCache::Entry::initializeShareableResourceHandleFromStorageRecord):
* Shared/ShareableResource.cpp:
(WebKit::shareableResourceDeallocate):
(WebKit::ShareableResource::wrapInSharedBuffer):
(WebKit::ShareableResource::Handle::tryWrapInSharedBuffer):
(WebKit::ShareableResource::create):
(WebKit::ShareableResource::map):
(WebKit::ShareableResource::ShareableResource):
* Shared/ShareableResource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntrycpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202356 => 202357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-22 23:23:46 UTC (rev 202356)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-22 23:31:42 UTC (rev 202357)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-06-22 Chris Dumez <cdumez@apple.com>
+
+ Stop using PassRefPtr in ShareableResource
+ https://bugs.webkit.org/show_bug.cgi?id=159043
+
+ Reviewed by Alex Christensen.
+
+ Stop using PassRefPtr in ShareableResource.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::store):
+ * NetworkProcess/cache/NetworkCacheEntry.cpp:
+ (WebKit::NetworkCache::Entry::initializeShareableResourceHandleFromStorageRecord):
+ * Shared/ShareableResource.cpp:
+ (WebKit::shareableResourceDeallocate):
+ (WebKit::ShareableResource::wrapInSharedBuffer):
+ (WebKit::ShareableResource::Handle::tryWrapInSharedBuffer):
+ (WebKit::ShareableResource::create):
+ (WebKit::ShareableResource::map):
+ (WebKit::ShareableResource::ShareableResource):
+ * Shared/ShareableResource.h:
+
</ins><span class="cx"> 2016-06-17 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Double tap to zoom does not work on yahoo finance
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (202356 => 202357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-06-22 23:23:46 UTC (rev 202356)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-06-22 23:31:42 UTC (rev 202357)
</span><span class="lines">@@ -412,8 +412,8 @@
</span><span class="cx"> m_storage->store(record, [completionHandler = WTFMove(completionHandler)](const Data& bodyData) {
</span><span class="cx"> MappedBody mappedBody;
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><del>- if (RefPtr<SharedMemory> sharedMemory = bodyData.tryCreateSharedMemory()) {
- mappedBody.shareableResource = ShareableResource::create(WTFMove(sharedMemory), 0, bodyData.size());
</del><ins>+ if (auto sharedMemory = bodyData.tryCreateSharedMemory()) {
+ mappedBody.shareableResource = ShareableResource::create(sharedMemory.releaseNonNull(), 0, bodyData.size());
</ins><span class="cx"> ASSERT(mappedBody.shareableResource);
</span><span class="cx"> mappedBody.shareableResource->createHandle(mappedBody.shareableResourceHandle);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp (202356 => 202357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp 2016-06-22 23:23:46 UTC (rev 202356)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp 2016-06-22 23:31:42 UTC (rev 202357)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> if (!sharedMemory)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto shareableResource = ShareableResource::create(WTFMove(sharedMemory), 0, m_sourceStorageRecord.body.size());
</del><ins>+ auto shareableResource = ShareableResource::create(sharedMemory.releaseNonNull(), 0, m_sourceStorageRecord.body.size());
</ins><span class="cx"> shareableResource->createHandle(m_shareableResourceHandle);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableResource.cpp (202356 => 202357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableResource.cpp 2016-06-22 23:23:46 UTC (rev 202356)
+++ trunk/Source/WebKit2/Shared/ShareableResource.cpp 2016-06-22 23:31:42 UTC (rev 202357)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> static void shareableResourceDeallocate(void *ptr, void *info)
</span><span class="cx"> {
</span><del>- (static_cast<ShareableResource*>(info))->deref(); // Balanced by ref() in createShareableResourceDeallocator()
</del><ins>+ static_cast<ShareableResource*>(info)->deref(); // Balanced by ref() in createShareableResourceDeallocator()
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static CFAllocatorRef createShareableResourceDeallocator(ShareableResource* resource)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> ShareableResource::wrapInSharedBuffer()
</del><ins>+RefPtr<SharedBuffer> ShareableResource::wrapInSharedBuffer()
</ins><span class="cx"> {
</span><span class="cx"> ref(); // Balanced by deref when SharedBuffer is deallocated.
</span><span class="cx">
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> ShareableResource::Handle::tryWrapInSharedBuffer() const
</del><ins>+RefPtr<SharedBuffer> ShareableResource::Handle::tryWrapInSharedBuffer() const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ShareableResource> resource = ShareableResource::map(*this);
</span><span class="cx"> if (!resource) {
</span><span class="lines">@@ -107,26 +107,25 @@
</span><span class="cx"> return resource->wrapInSharedBuffer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<ShareableResource> ShareableResource::create(PassRefPtr<SharedMemory> sharedMemory, unsigned offset, unsigned size)
</del><ins>+Ref<ShareableResource> ShareableResource::create(Ref<SharedMemory>&& sharedMemory, unsigned offset, unsigned size)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new ShareableResource(sharedMemory, offset, size));
</del><ins>+ return adoptRef(*new ShareableResource(WTFMove(sharedMemory), offset, size));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ShareableResource> ShareableResource::map(const Handle& handle)
</del><ins>+RefPtr<ShareableResource> ShareableResource::map(const Handle& handle)
</ins><span class="cx"> {
</span><span class="cx"> auto sharedMemory = SharedMemory::map(handle.m_handle, SharedMemory::Protection::ReadOnly);
</span><span class="cx"> if (!sharedMemory)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- return create(WTFMove(sharedMemory), handle.m_offset, handle.m_size);
</del><ins>+ return create(sharedMemory.releaseNonNull(), handle.m_offset, handle.m_size);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ShareableResource::ShareableResource(PassRefPtr<SharedMemory> sharedMemory, unsigned offset, unsigned size)
- : m_sharedMemory(sharedMemory)
</del><ins>+ShareableResource::ShareableResource(Ref<SharedMemory>&& sharedMemory, unsigned offset, unsigned size)
+ : m_sharedMemory(WTFMove(sharedMemory))
</ins><span class="cx"> , m_offset(offset)
</span><span class="cx"> , m_size(size)
</span><span class="cx"> {
</span><del>- ASSERT(m_sharedMemory);
</del><span class="cx"> ASSERT(m_offset + m_size <= m_sharedMemory->size());
</span><span class="cx">
</span><span class="cx"> // FIXME (NetworkProcess): This data was received from another process. If it is bogus, should we assume that process is compromised and we should kill it?
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableResource.h (202356 => 202357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableResource.h 2016-06-22 23:23:46 UTC (rev 202356)
+++ trunk/Source/WebKit2/Shared/ShareableResource.h 2016-06-22 23:31:42 UTC (rev 202357)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "SharedMemory.h"
</span><span class="cx">
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -56,7 +55,7 @@
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, Handle&);
</span><span class="cx">
</span><del>- PassRefPtr<WebCore::SharedBuffer> tryWrapInSharedBuffer() const;
</del><ins>+ RefPtr<WebCore::SharedBuffer> tryWrapInSharedBuffer() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class ShareableResource;
</span><span class="lines">@@ -67,10 +66,10 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Create a shareable resource that uses malloced memory.
</span><del>- static Ref<ShareableResource> create(PassRefPtr<SharedMemory>, unsigned offset, unsigned size);
</del><ins>+ static Ref<ShareableResource> create(Ref<SharedMemory>&&, unsigned offset, unsigned size);
</ins><span class="cx">
</span><span class="cx"> // Create a shareable resource from a handle.
</span><del>- static PassRefPtr<ShareableResource> map(const Handle&);
</del><ins>+ static RefPtr<ShareableResource> map(const Handle&);
</ins><span class="cx">
</span><span class="cx"> // Create a handle.
</span><span class="cx"> bool createHandle(Handle&);
</span><span class="lines">@@ -81,10 +80,10 @@
</span><span class="cx"> unsigned size() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ShareableResource(PassRefPtr<SharedMemory>, unsigned offset, unsigned size);
- PassRefPtr<WebCore::SharedBuffer> wrapInSharedBuffer();
</del><ins>+ ShareableResource(Ref<SharedMemory>&&, unsigned offset, unsigned size);
+ RefPtr<WebCore::SharedBuffer> wrapInSharedBuffer();
</ins><span class="cx">
</span><del>- RefPtr<SharedMemory> m_sharedMemory;
</del><ins>+ Ref<SharedMemory> m_sharedMemory;
</ins><span class="cx">
</span><span class="cx"> unsigned m_offset;
</span><span class="cx"> unsigned m_size;
</span></span></pre>
</div>
</div>
</body>
</html>