<!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>[179446] 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/179446">179446</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-01-31 12:43:33 -0800 (Sat, 31 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>OSObjectPtr does not work with dispatch_data_t on Maverics
https://bugs.webkit.org/show_bug.cgi?id=141081
Reviewed by Zalan Bujtas.
Previous attempt to special case dispatch_data_t in OSObjectPtr didn't work in all cases
probably due to the context sensitivity of the definition of the dispatch_data_t type.
For now, add DispatchPtr for the cache code and use it.
* NetworkProcess/cache/NetworkCacheStorage.h:
(WebKit::DispatchPtr::DispatchPtr):
(WebKit::DispatchPtr::~DispatchPtr):
(WebKit::DispatchPtr::operator=):
(WebKit::DispatchPtr::get):
(WebKit::DispatchPtr::operator bool):
(WebKit::adoptDispatch):
* NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
(WebKit::NetworkCacheStorage::Data::Data):
(WebKit::NetworkCacheStorage::Data::data):
(WebKit::NetworkCacheStorage::NetworkCacheStorage):
(WebKit::createIOChannelForKey):
(WebKit::decodeEntry):
(WebKit::encodeEntryMetaData):
(WebKit::encodeEntry):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179445 => 179446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-31 20:42:57 UTC (rev 179445)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-31 20:43:33 UTC (rev 179446)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-01-31 Antti Koivisto <antti@apple.com>
+
+ OSObjectPtr does not work with dispatch_data_t on Maverics
+ https://bugs.webkit.org/show_bug.cgi?id=141081
+
+ Reviewed by Zalan Bujtas.
+
+ Previous attempt to special case dispatch_data_t in OSObjectPtr didn't work in all cases
+ probably due to the context sensitivity of the definition of the dispatch_data_t type.
+
+ For now, add DispatchPtr for the cache code and use it.
+
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+ (WebKit::DispatchPtr::DispatchPtr):
+ (WebKit::DispatchPtr::~DispatchPtr):
+ (WebKit::DispatchPtr::operator=):
+ (WebKit::DispatchPtr::get):
+ (WebKit::DispatchPtr::operator bool):
+ (WebKit::adoptDispatch):
+ * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+ (WebKit::NetworkCacheStorage::Data::Data):
+ (WebKit::NetworkCacheStorage::Data::data):
+ (WebKit::NetworkCacheStorage::NetworkCacheStorage):
+ (WebKit::createIOChannelForKey):
+ (WebKit::decodeEntry):
+ (WebKit::encodeEntryMetaData):
+ (WebKit::encodeEntry):
+
</ins><span class="cx"> 2015-01-30 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Add and hook up APINavigationClient
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (179445 => 179446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-01-31 20:42:57 UTC (rev 179445)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-01-31 20:43:33 UTC (rev 179446)
</span><span class="lines">@@ -34,10 +34,6 @@
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
-#include <wtf/OSObjectPtr.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> class SharedBuffer;
</span><span class="cx"> }
</span><span class="lines">@@ -51,6 +47,57 @@
</span><span class="cx">
</span><span class="cx"> class ShareableResource;
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+template <typename T> class DispatchPtr;
+template <typename T> DispatchPtr<T> adoptDispatch(T dispatchObject);
+
+// FIXME: Use OSObjectPtr instead when it works with dispatch_data_t on all platforms.
+template<typename T> class DispatchPtr {
+public:
+ DispatchPtr()
+ : m_ptr(nullptr)
+ {
+ }
+ DispatchPtr(const DispatchPtr& other)
+ : m_ptr(other.m_ptr)
+ {
+ if (m_ptr)
+ dispatch_retain(m_ptr);
+ }
+ ~DispatchPtr()
+ {
+ if (m_ptr)
+ dispatch_release(m_ptr);
+ }
+
+ DispatchPtr& operator=(const DispatchPtr& other)
+ {
+ auto copy = other;
+ std::swap(m_ptr, copy.m_ptr);
+ return *this;
+ }
+
+ T get() const { return m_ptr; }
+ explicit operator bool() const { return m_ptr; }
+
+ friend DispatchPtr adoptDispatch<T>(T);
+
+private:
+ struct Adopt { };
+ DispatchPtr(Adopt, T data)
+ : m_ptr(data)
+ {
+ }
+
+ T m_ptr;
+};
+
+template <typename T> DispatchPtr<T> adoptDispatch(T dispatchObject)
+{
+ return DispatchPtr<T>(typename DispatchPtr<T>::Adopt { }, dispatchObject);
+}
+#endif
+
</ins><span class="cx"> class NetworkCacheStorage {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NetworkCacheStorage);
</span><span class="cx"> public:
</span><span class="lines">@@ -61,7 +108,7 @@
</span><span class="cx"> Data();
</span><span class="cx"> Data(const uint8_t*, size_t);
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- explicit Data(OSObjectPtr<dispatch_data_t>);
</del><ins>+ explicit Data(DispatchPtr<dispatch_data_t>);
</ins><span class="cx"> #endif
</span><span class="cx"> bool isNull() const;
</span><span class="cx">
</span><span class="lines">@@ -73,7 +120,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> private:
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- mutable OSObjectPtr<dispatch_data_t> m_dispatchData;
</del><ins>+ mutable DispatchPtr<dispatch_data_t> m_dispatchData;
</ins><span class="cx"> #endif
</span><span class="cx"> mutable const uint8_t* m_data;
</span><span class="cx"> size_t m_size;
</span><span class="lines">@@ -120,8 +167,8 @@
</span><span class="cx"> unsigned m_activeRetrieveOperationCount { 0 };
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- mutable OSObjectPtr<dispatch_queue_t> m_ioQueue;
- mutable OSObjectPtr<dispatch_queue_t> m_backgroundIOQueue;
</del><ins>+ mutable DispatchPtr<dispatch_queue_t> m_ioQueue;
+ mutable DispatchPtr<dispatch_queue_t> m_backgroundIOQueue;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm (179445 => 179446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-01-31 20:42:57 UTC (rev 179445)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-01-31 20:43:33 UTC (rev 179446)
</span><span class="lines">@@ -80,16 +80,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkCacheStorage::Data::Data(const uint8_t* data, size_t size)
</span><del>- : m_dispatchData(adoptOSObject(dispatch_data_create(data, size, nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT)))
</del><ins>+ : m_dispatchData(adoptDispatch(dispatch_data_create(data, size, nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT)))
</ins><span class="cx"> , m_data(nullptr)
</span><span class="cx"> , m_size(size)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NetworkCacheStorage::Data::Data(OSObjectPtr<dispatch_data_t> dispatchData)
</del><ins>+NetworkCacheStorage::Data::Data(DispatchPtr<dispatch_data_t> dispatchData)
</ins><span class="cx"> {
</span><span class="cx"> const void* data;
</span><del>- m_dispatchData = adoptOSObject(dispatch_data_create_map(dispatchData.get(), &data, &m_size));
</del><ins>+ m_dispatchData = adoptDispatch(dispatch_data_create_map(dispatchData.get(), &data, &m_size));
</ins><span class="cx"> m_data = static_cast<const uint8_t*>(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> if (!m_data) {
</span><span class="cx"> const void* data;
</span><span class="cx"> size_t size;
</span><del>- m_dispatchData = adoptOSObject(dispatch_data_create_map(m_dispatchData.get(), &data, &size));
</del><ins>+ m_dispatchData = adoptDispatch(dispatch_data_create_map(m_dispatchData.get(), &data, &size));
</ins><span class="cx"> ASSERT(size == m_size);
</span><span class="cx"> m_data = static_cast<const uint8_t*>(data);
</span><span class="cx"> }
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx">
</span><span class="cx"> NetworkCacheStorage::NetworkCacheStorage(const String& directoryPath)
</span><span class="cx"> : m_directoryPath(directoryPath)
</span><del>- , m_ioQueue(adoptOSObject(dispatch_queue_create("com.apple.WebKit.Cache.Storage", DISPATCH_QUEUE_CONCURRENT)))
- , m_backgroundIOQueue(adoptOSObject(dispatch_queue_create("com.apple.WebKit.Cache.Storage.Background", DISPATCH_QUEUE_CONCURRENT)))
</del><ins>+ , m_ioQueue(adoptDispatch(dispatch_queue_create("com.apple.WebKit.Cache.Storage", DISPATCH_QUEUE_CONCURRENT)))
+ , m_backgroundIOQueue(adoptDispatch(dispatch_queue_create("com.apple.WebKit.Cache.Storage.Background", DISPATCH_QUEUE_CONCURRENT)))
</ins><span class="cx"> {
</span><span class="cx"> dispatch_set_target_queue(m_backgroundIOQueue.get(), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0));
</span><span class="cx">
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> enum class IOChannelType { Read, Write };
</span><del>-static OSObjectPtr<dispatch_io_t> createIOChannelForKey(const NetworkCacheKey& key, IOChannelType type, const String& cachePath, int& fd)
</del><ins>+static DispatchPtr<dispatch_io_t> createIOChannelForKey(const NetworkCacheKey& key, IOChannelType type, const String& cachePath, int& fd)
</ins><span class="cx"> {
</span><span class="cx"> int oflag;
</span><span class="cx"> mode_t mode;
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx">
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) opening %s type=%d", path.data(), type);
</span><span class="cx">
</span><del>- OSObjectPtr<dispatch_io_t> channel = adoptOSObject(dispatch_io_create(DISPATCH_IO_RANDOM, fd, dispatch_get_main_queue(), [fd, type](int error) {
</del><ins>+ auto channel = adoptDispatch(dispatch_io_create(DISPATCH_IO_RANDOM, fd, dispatch_get_main_queue(), [fd, type](int error) {
</ins><span class="cx"> close(fd);
</span><span class="cx"> if (error)
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) error creating io channel %d", error);
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> if (metaData.bodyOffset + metaData.bodySize != dispatch_data_get_size(fileData))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto headerData = adoptOSObject(dispatch_data_create_subrange(fileData, metaData.headerOffset, metaData.headerSize));
</del><ins>+ auto headerData = adoptDispatch(dispatch_data_create_subrange(fileData, metaData.headerOffset, metaData.headerSize));
</ins><span class="cx"> if (metaData.headerChecksum != hashData(headerData.get())) {
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) header checksum mismatch");
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto bodyData = adoptOSObject(dispatch_data_create(map, metaData.bodySize, dispatch_get_main_queue(), [map, mapSize] {
</del><ins>+ auto bodyData = adoptDispatch(dispatch_data_create(map, metaData.bodySize, dispatch_get_main_queue(), [map, mapSize] {
</ins><span class="cx"> munmap(map, mapSize);
</span><span class="cx"> }));
</span><span class="cx">
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static OSObjectPtr<dispatch_data_t> encodeEntryMetaData(const EntryMetaData& entry)
</del><ins>+static DispatchPtr<dispatch_data_t> encodeEntryMetaData(const EntryMetaData& entry)
</ins><span class="cx"> {
</span><span class="cx"> NetworkCacheEncoder encoder;
</span><span class="cx">
</span><span class="lines">@@ -308,10 +308,10 @@
</span><span class="cx">
</span><span class="cx"> encoder.encodeChecksum();
</span><span class="cx">
</span><del>- return adoptOSObject(dispatch_data_create(encoder.buffer(), encoder.bufferSize(), nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT));
</del><ins>+ return adoptDispatch(dispatch_data_create(encoder.buffer(), encoder.bufferSize(), nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static OSObjectPtr<dispatch_data_t> encodeEntry(const NetworkCacheKey& key, const NetworkCacheStorage::Entry& entry)
</del><ins>+static DispatchPtr<dispatch_data_t> encodeEntry(const NetworkCacheKey& key, const NetworkCacheStorage::Entry& entry)
</ins><span class="cx"> {
</span><span class="cx"> EntryMetaData metaData(key);
</span><span class="cx"> metaData.timeStamp = entry.timeStamp;
</span><span class="lines">@@ -321,18 +321,18 @@
</span><span class="cx"> metaData.bodySize = entry.body.size();
</span><span class="cx">
</span><span class="cx"> auto encodedMetaData = encodeEntryMetaData(metaData);
</span><del>- auto headerData = adoptOSObject(dispatch_data_create_concat(encodedMetaData.get(), entry.header.dispatchData()));
</del><ins>+ auto headerData = adoptDispatch(dispatch_data_create_concat(encodedMetaData.get(), entry.header.dispatchData()));
</ins><span class="cx"> if (!entry.body.size())
</span><span class="cx"> return headerData;
</span><span class="cx">
</span><span class="cx"> size_t headerSize = dispatch_data_get_size(headerData.get());
</span><span class="cx"> size_t dataOffset = round_page(headerSize);
</span><span class="cx"> Vector<uint8_t, 4096> filler(dataOffset - headerSize, 0);
</span><del>- OSObjectPtr<dispatch_data_t> alignmentData = adoptOSObject(dispatch_data_create(filler.data(), filler.size(), nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT));
</del><ins>+ auto alignmentData = adoptDispatch(dispatch_data_create(filler.data(), filler.size(), nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT));
</ins><span class="cx">
</span><del>- OSObjectPtr<dispatch_data_t> headerWithAlignmentData = adoptOSObject(dispatch_data_create_concat(headerData.get(), alignmentData.get()));
</del><ins>+ auto headerWithAlignmentData = adoptDispatch(dispatch_data_create_concat(headerData.get(), alignmentData.get()));
</ins><span class="cx">
</span><del>- return adoptOSObject(dispatch_data_create_concat(headerWithAlignmentData.get(), entry.body.dispatchData()));
</del><ins>+ return adoptDispatch(dispatch_data_create_concat(headerWithAlignmentData.get(), entry.body.dispatchData()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkCacheStorage::removeEntry(const NetworkCacheKey& key)
</span></span></pre>
</div>
</div>
</body>
</html>