<!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>[176873] trunk/Source</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/176873">176873</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-12-05 14:20:49 -0800 (Fri, 05 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>PassRef should deref on destruction if pointee was not moved.
<https://webkit.org/b/139309>
Reviewed by Antti Koivisto.
Source/WebCore:
Remove calls to PassRef::dropRef() since it's no longer necessary to manually
notify PassRef that you didn't move the pointee.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::createFor):
(WebCore::RenderElement::setStyle):
* style/StyleResolveTree.cpp:
(WebCore::Style::resolveTree):
Source/WTF:
Let PassRef become nullptr internally after having WTF::move()'d the pointee.
This means that PassRef is now essentially a PassRefPtr that can only be
constructed with a non-null pointee.
This should make it possible for all ::create()-style construction helpers to
return PassRef, removing a branch in each case.
* wtf/PassRef.h:
(WTF::PassRef<T>::PassRef):
(WTF::PassRef<T>::~PassRef):
(WTF::PassRef<T>::get):
(WTF::PassRef<T>::ptr):
(WTF::PassRef<T>::leakRef):
(WTF::PassRef<T>::dropRef): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPassRefh">trunk/Source/WTF/wtf/PassRef.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (176872 => 176873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-12-05 22:13:18 UTC (rev 176872)
+++ trunk/Source/WTF/ChangeLog 2014-12-05 22:20:49 UTC (rev 176873)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-12-05 Andreas Kling <akling@apple.com>
+
+ PassRef should deref on destruction if pointee was not moved.
+ <https://webkit.org/b/139309>
+
+ Reviewed by Antti Koivisto.
+
+ Let PassRef become nullptr internally after having WTF::move()'d the pointee.
+ This means that PassRef is now essentially a PassRefPtr that can only be
+ constructed with a non-null pointee.
+
+ This should make it possible for all ::create()-style construction helpers to
+ return PassRef, removing a branch in each case.
+
+ * wtf/PassRef.h:
+ (WTF::PassRef<T>::PassRef):
+ (WTF::PassRef<T>::~PassRef):
+ (WTF::PassRef<T>::get):
+ (WTF::PassRef<T>::ptr):
+ (WTF::PassRef<T>::leakRef):
+ (WTF::PassRef<T>::dropRef): Deleted.
+
</ins><span class="cx"> 2014-12-05 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [WTF] MediaTime should support round-tripping from and to doubles.
</span></span></pre></div>
<a id="trunkSourceWTFwtfPassRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PassRef.h (176872 => 176873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PassRef.h 2014-12-05 22:13:18 UTC (rev 176872)
+++ trunk/Source/WTF/wtf/PassRef.h 2014-12-05 22:20:49 UTC (rev 176873)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -49,12 +49,9 @@
</span><span class="cx"> const T* ptr() const;
</span><span class="cx"> T* ptr();
</span><span class="cx">
</span><del>- void dropRef();
</del><span class="cx"> T& leakRef() WARN_UNUSED_RETURN;
</span><span class="cx">
</span><del>-#ifndef NDEBUG
</del><span class="cx"> ~PassRef();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend PassRef adoptRef<T>(T&);
</span><span class="lines">@@ -67,103 +64,73 @@
</span><span class="cx"> enum AdoptTag { Adopt };
</span><span class="cx"> PassRef(T&, AdoptTag);
</span><span class="cx">
</span><del>- T& m_reference;
-
-#ifndef NDEBUG
</del><ins>+ T* m_ptr;
</ins><span class="cx"> bool m_gaveUpReference;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T> inline PassRef<T>::PassRef(T& reference)
</span><del>- : m_reference(reference)
-#ifndef NDEBUG
- , m_gaveUpReference(false)
-#endif
</del><ins>+ : m_ptr(&reference)
</ins><span class="cx"> {
</span><del>- reference.ref();
</del><ins>+ m_ptr->ref();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> inline PassRef<T>::PassRef(PassRef&& other)
</span><del>- : m_reference(other.leakRef())
-#ifndef NDEBUG
- , m_gaveUpReference(false)
-#endif
</del><ins>+ : m_ptr(&other.leakRef())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> template<typename U> inline PassRef<T>::PassRef(PassRef<U> other)
</span><del>- : m_reference(other.leakRef())
-#ifndef NDEBUG
- , m_gaveUpReference(false)
-#endif
</del><ins>+ : m_ptr(&other.leakRef())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> template<typename U> inline PassRef<T>::PassRef(const Ref<U>& other)
</span><del>- : m_reference(static_cast<T&>(const_cast<U&>(other.get())))
-#ifndef NDEBUG
- , m_gaveUpReference(false)
-#endif
</del><ins>+ : m_ptr(static_cast<T*>(const_cast<U*>(other.ptr())))
</ins><span class="cx"> {
</span><del>- m_reference.ref();
</del><ins>+ ASSERT(m_ptr);
+ m_ptr->ref();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
-
</del><span class="cx"> template<typename T> PassRef<T>::~PassRef()
</span><span class="cx"> {
</span><del>- ASSERT(m_gaveUpReference);
</del><ins>+ if (m_ptr)
+ m_ptr->deref();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
-template<typename T> inline void PassRef<T>::dropRef()
-{
- ASSERT(!m_gaveUpReference);
- m_reference.deref();
-#ifndef NDEBUG
- m_gaveUpReference = true;
-#endif
-}
-
</del><span class="cx"> template<typename T> inline const T& PassRef<T>::get() const
</span><span class="cx"> {
</span><del>- ASSERT(!m_gaveUpReference);
- return m_reference;
</del><ins>+ ASSERT(m_ptr);
+ return *m_ptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> inline T& PassRef<T>::get()
</span><span class="cx"> {
</span><del>- ASSERT(!m_gaveUpReference);
- return m_reference;
</del><ins>+ ASSERT(m_ptr);
+ return *m_ptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> const T* PassRef<T>::ptr() const
</span><span class="cx"> {
</span><del>- ASSERT(!m_gaveUpReference);
- return &m_reference;
</del><ins>+ ASSERT(m_ptr);
+ return m_ptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> T* PassRef<T>::ptr()
</span><span class="cx"> {
</span><del>- ASSERT(!m_gaveUpReference);
- return &m_reference;
</del><ins>+ ASSERT(m_ptr);
+ return m_ptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> inline T& PassRef<T>::leakRef()
</span><span class="cx"> {
</span><del>-#ifndef NDEBUG
- ASSERT(!m_gaveUpReference);
- m_gaveUpReference = true;
-#endif
- return m_reference;
</del><ins>+ ASSERT(m_ptr);
+ T* leakedPtr = m_ptr;
+ m_ptr = nullptr;
+ return *leakedPtr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> inline PassRef<T>::PassRef(T& reference, AdoptTag)
</span><del>- : m_reference(reference)
-#ifndef NDEBUG
- , m_gaveUpReference(false)
-#endif
</del><ins>+ : m_ptr(&reference)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176872 => 176873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-05 22:13:18 UTC (rev 176872)
+++ trunk/Source/WebCore/ChangeLog 2014-12-05 22:20:49 UTC (rev 176873)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-12-05 Andreas Kling <akling@apple.com>
+
+ PassRef should deref on destruction if pointee was not moved.
+ <https://webkit.org/b/139309>
+
+ Reviewed by Antti Koivisto.
+
+ Remove calls to PassRef::dropRef() since it's no longer necessary to manually
+ notify PassRef that you didn't move the pointee.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::createFor):
+ (WebCore::RenderElement::setStyle):
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::resolveTree):
+
</ins><span class="cx"> 2014-12-05 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix style sharing with the "type" and "readonly" attributes
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (176872 => 176873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-12-05 22:13:18 UTC (rev 176872)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-12-05 22:20:49 UTC (rev 176873)
</span><span class="lines">@@ -159,7 +159,6 @@
</span><span class="cx"> return createRenderer<RenderRubyText>(element, WTF::move(style));
</span><span class="cx"> switch (style.get().display()) {
</span><span class="cx"> case NONE:
</span><del>- style.dropRef();
</del><span class="cx"> return nullptr;
</span><span class="cx"> case INLINE:
</span><span class="cx"> return createRenderer<RenderInline>(element, WTF::move(style));
</span><span class="lines">@@ -399,7 +398,6 @@
</span><span class="cx"> ASSERT(!isRenderIFrame());
</span><span class="cx"> ASSERT(!isEmbeddedObject());
</span><span class="cx"> ASSERT(!isCanvas());
</span><del>- style.dropRef();
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (176872 => 176873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-12-05 22:13:18 UTC (rev 176872)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-12-05 22:20:49 UTC (rev 176873)
</span><span class="lines">@@ -984,8 +984,6 @@
</span><span class="cx"> Style::Change documentChange = determineChange(documentStyle.get(), document.renderView()->style());
</span><span class="cx"> if (documentChange != NoChange)
</span><span class="cx"> document.renderView()->setStyle(WTF::move(documentStyle));
</span><del>- else
- documentStyle.dropRef();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Element* documentElement = document.documentElement();
</span></span></pre>
</div>
</div>
</body>
</html>