<!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>[160187] 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/160187">160187</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-05 12:40:21 -0800 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweak WeakObjCPtr
https://bugs.webkit.org/show_bug.cgi?id=125311
Reviewed by Darin Adler.
Source/WebKit2:
Make it possible to use WeakObjCPtr with pointer types such as id. Also,
add a getAutoreleased() member that will load the weak pointer and retain + autorelease it.
* Shared/mac/WeakObjCPtr.h:
(WebKit::WeakObjCPtr::WeakObjCPtr):
(WebKit::WeakObjCPtr::operator=):
(WebKit::WeakObjCPtr::get):
(WebKit::WeakObjCPtr::getAutoreleased):
Tools:
Split up tests into more logical groups. Add new tests for new functionality.
* TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWeakObjCPtrh">trunk/Source/WebKit2/Shared/mac/WeakObjCPtr.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2macWeakObjCPtrmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160186 => 160187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-05 20:33:35 UTC (rev 160186)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-05 20:40:21 UTC (rev 160187)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-05 Anders Carlsson <andersca@apple.com>
+
+ Tweak WeakObjCPtr
+ https://bugs.webkit.org/show_bug.cgi?id=125311
+
+ Reviewed by Darin Adler.
+
+ Make it possible to use WeakObjCPtr with pointer types such as id. Also,
+ add a getAutoreleased() member that will load the weak pointer and retain + autorelease it.
+
+ * Shared/mac/WeakObjCPtr.h:
+ (WebKit::WeakObjCPtr::WeakObjCPtr):
+ (WebKit::WeakObjCPtr::operator=):
+ (WebKit::WeakObjCPtr::get):
+ (WebKit::WeakObjCPtr::getAutoreleased):
+
</ins><span class="cx"> 2013-12-05 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][WK2] Clean up WorkQueueGtk
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWeakObjCPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WeakObjCPtr.h (160186 => 160187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WeakObjCPtr.h 2013-12-05 20:33:35 UTC (rev 160186)
+++ trunk/Source/WebKit2/Shared/mac/WeakObjCPtr.h 2013-12-05 20:40:21 UTC (rev 160187)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WeakObjCPtr_h
</span><span class="cx">
</span><span class="cx"> #include <objc/runtime.h>
</span><ins>+#include <type_traits>
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if __has_include(<objc/objc-internal.h>)
</span><span class="lines">@@ -43,12 +44,14 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> class WeakObjCPtr {
</span><span class="cx"> public:
</span><ins>+ typedef typename std::remove_pointer<T>::type ValueType;
+
</ins><span class="cx"> WeakObjCPtr()
</span><span class="cx"> : m_weakReference(nullptr)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WeakObjCPtr(T *ptr)
</del><ins>+ WeakObjCPtr(ValueType *ptr)
</ins><span class="cx"> {
</span><span class="cx"> objc_initWeak(&m_weakReference, ptr);
</span><span class="cx"> }
</span><span class="lines">@@ -58,18 +61,23 @@
</span><span class="cx"> objc_destroyWeak(&m_weakReference);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WeakObjCPtr& operator=(T *ptr)
</del><ins>+ WeakObjCPtr& operator=(ValueType *ptr)
</ins><span class="cx"> {
</span><span class="cx"> objc_storeWeak(&m_weakReference, ptr);
</span><span class="cx">
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<T> get() const
</del><ins>+ RetainPtr<ValueType> get() const
</ins><span class="cx"> {
</span><span class="cx"> return adoptNS(objc_loadWeakRetained(const_cast<id*>(&m_weakReference)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ValueType *getAutoreleased() const
+ {
+ return static_cast<ValueType *>(objc_loadWeak(const_cast<id*>(&m_weakReference)));
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> id m_weakReference;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160186 => 160187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-05 20:33:35 UTC (rev 160186)
+++ trunk/Tools/ChangeLog 2013-12-05 20:40:21 UTC (rev 160187)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-05 Anders Carlsson <andersca@apple.com>
+
+ Tweak WeakObjCPtr
+ https://bugs.webkit.org/show_bug.cgi?id=125311
+
+ Reviewed by Darin Adler.
+
+ Split up tests into more logical groups. Add new tests for new functionality.
+
+ * TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm:
+
</ins><span class="cx"> 2013-12-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix gtk-doc warnings when generating DOM bindings API docs
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2macWeakObjCPtrmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm (160186 => 160187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm 2013-12-05 20:33:35 UTC (rev 160186)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm 2013-12-05 20:40:21 UTC (rev 160187)
</span><span class="lines">@@ -29,52 +29,80 @@
</span><span class="cx">
</span><span class="cx"> using WebKit::WeakObjCPtr;
</span><span class="cx">
</span><del>-TEST(WebKit2, WeakObjCPtr)
</del><ins>+TEST(WebKit2_WeakObjCPtr, Construction)
</ins><span class="cx"> {
</span><del>- // Test construction.
- {
- NSObject *object = [[NSObject alloc] init];
</del><ins>+ NSObject *object = [[NSObject alloc] init];
</ins><span class="cx">
</span><del>- WeakObjCPtr<NSObject> weak(object);
</del><ins>+ WeakObjCPtr<NSObject> weak(object);
</ins><span class="cx">
</span><del>- EXPECT_EQ(weak.get(), object);
</del><ins>+ EXPECT_EQ(weak.get(), object);
</ins><span class="cx">
</span><del>- [object release];
</del><ins>+ [object release];
</ins><span class="cx">
</span><del>- EXPECT_EQ(weak.get(), (void*)nil);
- }
</del><ins>+ EXPECT_EQ(weak.get(), (void*)nil);
+}
</ins><span class="cx">
</span><del>- // Test assignment.
- {
- NSObject *object1 = [[NSObject alloc] init];
</del><ins>+TEST(WebKit2_WeakObjCPtr, Assignment)
+{
+ NSObject *object1 = [[NSObject alloc] init];
</ins><span class="cx">
</span><del>- WeakObjCPtr<NSObject> weak(object1);
</del><ins>+ WeakObjCPtr<NSObject> weak(object1);
</ins><span class="cx">
</span><del>- EXPECT_EQ(weak.get(), object1);
</del><ins>+ EXPECT_EQ(weak.get(), object1);
</ins><span class="cx">
</span><del>- NSObject *object2 = [[NSObject alloc] init];
</del><ins>+ NSObject *object2 = [[NSObject alloc] init];
</ins><span class="cx">
</span><del>- weak = object2;
- EXPECT_EQ(weak.get(), object2);
</del><ins>+ weak = object2;
+ EXPECT_EQ(weak.get(), object2);
</ins><span class="cx">
</span><del>- [object1 release];
- EXPECT_EQ(weak.get(), object2);
</del><ins>+ [object1 release];
+ EXPECT_EQ(weak.get(), object2);
</ins><span class="cx">
</span><del>- [object2 release];
- EXPECT_EQ(weak.get(), (void*)nil);
</del><ins>+ [object2 release];
+ EXPECT_EQ(weak.get(), (void*)nil);
+}
+
+TEST(WebKit2_WeakObjCPtr, ObjectOutlivesItsWeakPointer)
+{
+ NSObject *object = [[NSObject alloc] init];
+
+ {
+ WeakObjCPtr<NSObject> weak(object);
+
+ EXPECT_EQ(weak.get(), object);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Test having an object that outlives its weak pointer.
- {
</del><ins>+ [object release];
+}
+
+TEST(WebKit2_WeakObjCPtr, GetAutoreleased)
+{
+ WeakObjCPtr<NSObject> weak;
+
+ @autoreleasepool {
</ins><span class="cx"> NSObject *object = [[NSObject alloc] init];
</span><span class="cx">
</span><del>- {
- WeakObjCPtr<NSObject> weak(object);
</del><ins>+ weak = object;
</ins><span class="cx">
</span><del>- EXPECT_EQ(weak.get(), object);
- }
</del><ins>+ EXPECT_EQ(weak.getAutoreleased(), object);
+
+ [object release];
</ins><span class="cx">
</span><del>- [object release];
</del><ins>+ // The object is still in the autorelease pool.
+ EXPECT_EQ(weak.getAutoreleased(), object);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ EXPECT_EQ(weak.getAutoreleased(), (id)nil);
</ins><span class="cx"> }
</span><ins>+
+TEST(WebKit2_WeakObjCPtr, Id)
+{
+ id object = [[NSObject alloc] init];
+ WeakObjCPtr<id> weak(object);
+
+ EXPECT_EQ(weak.get(), object);
+
+ [object release];
+
+ EXPECT_EQ(weak.get(), (void*)nil);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>