<!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>[179408] trunk</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/179408">179408</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-01-30 12:46:00 -0800 (Fri, 30 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 Pratik Solanki.
Source/WTF:
Trying to use OSObjectPtr<dispatch_data_t> throws
-[OS_dispatch_data _xref_dispose]: unrecognized selector sent to instance 0
* wtf/OSObjectPtr.h:
(WTF::retainOSObject<dispatch_data_t>):
(WTF::releaseOSObject<dispatch_data_t>):
Add specialization for dispatch_data_t on Maverics.
Tools:
* TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfOSObjectPtrh">trunk/Source/WTF/wtf/OSObjectPtr.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFdarwinOSObjectPtrcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (179407 => 179408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-01-30 19:57:35 UTC (rev 179407)
+++ trunk/Source/WTF/ChangeLog 2015-01-30 20:46:00 UTC (rev 179408)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-30 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 Pratik Solanki.
+
+ Trying to use OSObjectPtr<dispatch_data_t> throws
+
+ -[OS_dispatch_data _xref_dispose]: unrecognized selector sent to instance 0
+
+ * wtf/OSObjectPtr.h:
+ (WTF::retainOSObject<dispatch_data_t>):
+ (WTF::releaseOSObject<dispatch_data_t>):
+
+ Add specialization for dispatch_data_t on Maverics.
+
</ins><span class="cx"> 2015-01-29 Santosh Mahto <santoshbit2007@gmail.com>
</span><span class="cx">
</span><span class="cx"> Refactor String::format to handle unreached va_end.
</span></span></pre></div>
<a id="trunkSourceWTFwtfOSObjectPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/OSObjectPtr.h (179407 => 179408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OSObjectPtr.h 2015-01-30 19:57:35 UTC (rev 179407)
+++ trunk/Source/WTF/wtf/OSObjectPtr.h 2015-01-30 20:46:00 UTC (rev 179408)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
</span><span class="cx">
</span><ins>+#include <dispatch/dispatch.h>
</ins><span class="cx"> #if __has_include(<os/object_private.h>)
</span><span class="cx"> #include <os/object_private.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -82,6 +83,18 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
+template<> inline void retainOSObject<dispatch_data_t>(dispatch_data_t ptr)
+{
+ dispatch_retain(ptr);
+}
+
+template<> inline void releaseOSObject<dispatch_data_t>(dispatch_data_t ptr)
+{
+ dispatch_release(ptr);
+}
+#endif
+
</ins><span class="cx"> template<typename T> class OSObjectPtr {
</span><span class="cx"> public:
</span><span class="cx"> OSObjectPtr()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179407 => 179408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-30 19:57:35 UTC (rev 179407)
+++ trunk/Tools/ChangeLog 2015-01-30 20:46:00 UTC (rev 179408)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-30 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 Pratik Solanki.
+
+ * TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2015-01-30 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Switch to Apache on Windows
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFdarwinOSObjectPtrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp (179407 => 179408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp 2015-01-30 19:57:35 UTC (rev 179407)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp 2015-01-30 20:46:00 UTC (rev 179408)
</span><span class="lines">@@ -63,4 +63,16 @@
</span><span class="cx"> WTF::releaseOSObject(queue);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(OSObjectPtr, DispatchData)
+{
+ uint8_t buffer[1024] { };
+ OSObjectPtr<dispatch_data_t> foo = adoptOSObject(dispatch_data_create(buffer, 1024, nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT));
+ EXPECT_EQ(1, CFGetRetainCount(foo.get()));
+ {
+ OSObjectPtr<dispatch_data_t> foo2 = foo;
+ EXPECT_EQ(2, CFGetRetainCount(foo.get()));
+ }
+ EXPECT_EQ(1, CFGetRetainCount(foo.get()));
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>