<!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>[177751] trunk/Source/WebCore</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/177751">177751</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-12-26 15:00:04 -0800 (Fri, 26 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Purge PassRefPtr from Element and ElementRareData.
<https://webkit.org/b/139949>
Reviewed by Anders Carlsson.
Make functions that used to take PassRefPtr now take Ref&& or RefPtr&&
instead depending on possible nullity of incoming values.
* dom/Element.cpp:
(WebCore::Element::addShadowRoot):
(WebCore::Element::setBeforePseudoElement):
(WebCore::Element::setAfterPseudoElement):
* dom/Element.h:
* dom/ElementRareData.h:
(WebCore::ElementRareData::setShadowRoot):
(WebCore::ElementRareData::setBeforePseudoElement):
(WebCore::ElementRareData::setAfterPseudoElement):
* dom/PseudoElement.h:
* dom/ShadowRoot.h:
* style/StyleResolveTree.cpp:
(WebCore::Style::setBeforeOrAfterPseudoElement):
(WebCore::Style::attachBeforeOrAfterPseudoElementIfNeeded):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementRareDatah">trunk/Source/WebCore/dom/ElementRareData.h</a></li>
<li><a href="#trunkSourceWebCoredomPseudoElementh">trunk/Source/WebCore/dom/PseudoElement.h</a></li>
<li><a href="#trunkSourceWebCoredomShadowRooth">trunk/Source/WebCore/dom/ShadowRoot.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177750 => 177751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-26 22:16:30 UTC (rev 177750)
+++ trunk/Source/WebCore/ChangeLog 2014-12-26 23:00:04 UTC (rev 177751)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-12-26 Andreas Kling <akling@apple.com>
+
+ Purge PassRefPtr from Element and ElementRareData.
+ <https://webkit.org/b/139949>
+
+ Reviewed by Anders Carlsson.
+
+ Make functions that used to take PassRefPtr now take Ref&& or RefPtr&&
+ instead depending on possible nullity of incoming values.
+
+ * dom/Element.cpp:
+ (WebCore::Element::addShadowRoot):
+ (WebCore::Element::setBeforePseudoElement):
+ (WebCore::Element::setAfterPseudoElement):
+ * dom/Element.h:
+ * dom/ElementRareData.h:
+ (WebCore::ElementRareData::setShadowRoot):
+ (WebCore::ElementRareData::setBeforePseudoElement):
+ (WebCore::ElementRareData::setAfterPseudoElement):
+ * dom/PseudoElement.h:
+ * dom/ShadowRoot.h:
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::setBeforeOrAfterPseudoElement):
+ (WebCore::Style::attachBeforeOrAfterPseudoElementIfNeeded):
+
</ins><span class="cx"> 2014-12-26 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (177750 => 177751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-12-26 22:16:30 UTC (rev 177750)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-12-26 23:00:04 UTC (rev 177751)
</span><span class="lines">@@ -1457,24 +1457,24 @@
</span><span class="cx"> setNeedsNodeRenderingTraversalSlowPath(shouldUseNodeRenderingTraversalSlowPath(*this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::addShadowRoot(PassRefPtr<ShadowRoot> newShadowRoot)
</del><ins>+void Element::addShadowRoot(Ref<ShadowRoot>&& newShadowRoot)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!shadowRoot());
</span><span class="cx">
</span><del>- ShadowRoot* shadowRoot = newShadowRoot.get();
- ensureElementRareData().setShadowRoot(newShadowRoot);
</del><ins>+ ShadowRoot& shadowRoot = newShadowRoot.get();
+ ensureElementRareData().setShadowRoot(WTF::move(newShadowRoot));
</ins><span class="cx">
</span><del>- shadowRoot->setHostElement(this);
- shadowRoot->setParentTreeScope(&treeScope());
- shadowRoot->distributor().didShadowBoundaryChange(this);
</del><ins>+ shadowRoot.setHostElement(this);
+ shadowRoot.setParentTreeScope(&treeScope());
+ shadowRoot.distributor().didShadowBoundaryChange(this);
</ins><span class="cx">
</span><del>- ChildNodeInsertionNotifier(*this).notify(*shadowRoot);
</del><ins>+ ChildNodeInsertionNotifier(*this).notify(shadowRoot);
</ins><span class="cx">
</span><span class="cx"> resetNeedsNodeRenderingTraversalSlowPath();
</span><span class="cx">
</span><span class="cx"> setNeedsStyleRecalc(ReconstructRenderTree);
</span><span class="cx">
</span><del>- InspectorInstrumentation::didPushShadowRoot(this, shadowRoot);
</del><ins>+ InspectorInstrumentation::didPushShadowRoot(this, &shadowRoot);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::removeShadowRoot()
</span><span class="lines">@@ -2329,14 +2329,14 @@
</span><span class="cx"> return hasRareData() ? elementRareData()->afterPseudoElement() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::setBeforePseudoElement(PassRefPtr<PseudoElement> element)
</del><ins>+void Element::setBeforePseudoElement(Ref<PseudoElement>&& element)
</ins><span class="cx"> {
</span><del>- ensureElementRareData().setBeforePseudoElement(element);
</del><ins>+ ensureElementRareData().setBeforePseudoElement(WTF::move(element));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::setAfterPseudoElement(PassRefPtr<PseudoElement> element)
</del><ins>+void Element::setAfterPseudoElement(Ref<PseudoElement>&& element)
</ins><span class="cx"> {
</span><del>- ensureElementRareData().setAfterPseudoElement(element);
</del><ins>+ ensureElementRareData().setAfterPseudoElement(WTF::move(element));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void disconnectPseudoElement(PseudoElement* pseudoElement)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (177750 => 177751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-12-26 22:16:30 UTC (rev 177750)
+++ trunk/Source/WebCore/dom/Element.h 2014-12-26 23:00:04 UTC (rev 177751)
</span><span class="lines">@@ -546,8 +546,8 @@
</span><span class="cx"> virtual void didDetachRenderers();
</span><span class="cx"> virtual RefPtr<RenderStyle> customStyleForRenderer(RenderStyle& parentStyle);
</span><span class="cx">
</span><del>- void setBeforePseudoElement(PassRefPtr<PseudoElement>);
- void setAfterPseudoElement(PassRefPtr<PseudoElement>);
</del><ins>+ void setBeforePseudoElement(Ref<PseudoElement>&&);
+ void setAfterPseudoElement(Ref<PseudoElement>&&);
</ins><span class="cx"> void clearBeforePseudoElement();
</span><span class="cx"> void clearAfterPseudoElement();
</span><span class="cx"> void resetComputedStyle();
</span><span class="lines">@@ -635,7 +635,7 @@
</span><span class="cx"> virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</span><span class="cx"> virtual RefPtr<Element> cloneElementWithoutAttributesAndChildren(Document&);
</span><span class="cx">
</span><del>- void addShadowRoot(PassRefPtr<ShadowRoot>);
</del><ins>+ void addShadowRoot(Ref<ShadowRoot>&&);
</ins><span class="cx"> void removeShadowRoot();
</span><span class="cx">
</span><span class="cx"> bool rareDataStyleAffectedByEmpty() const;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementRareData.h (177750 => 177751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementRareData.h 2014-12-26 22:16:30 UTC (rev 177750)
+++ trunk/Source/WebCore/dom/ElementRareData.h 2014-12-26 23:00:04 UTC (rev 177751)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "StyleInheritedData.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -39,8 +38,8 @@
</span><span class="cx"> ElementRareData(Element&, RenderElement*);
</span><span class="cx"> ~ElementRareData();
</span><span class="cx">
</span><del>- void setBeforePseudoElement(PassRefPtr<PseudoElement>);
- void setAfterPseudoElement(PassRefPtr<PseudoElement>);
</del><ins>+ void setBeforePseudoElement(RefPtr<PseudoElement>&&);
+ void setAfterPseudoElement(RefPtr<PseudoElement>&&);
</ins><span class="cx">
</span><span class="cx"> PseudoElement* beforePseudoElement() const { return m_beforePseudoElement.get(); }
</span><span class="cx"> PseudoElement* afterPseudoElement() const { return m_afterPseudoElement.get(); }
</span><span class="lines">@@ -85,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> void clearShadowRoot() { m_shadowRoot = nullptr; }
</span><span class="cx"> ShadowRoot* shadowRoot() const { return m_shadowRoot.get(); }
</span><del>- void setShadowRoot(PassRefPtr<ShadowRoot> shadowRoot) { m_shadowRoot = shadowRoot; }
</del><ins>+ void setShadowRoot(RefPtr<ShadowRoot>&& shadowRoot) { m_shadowRoot = WTF::move(shadowRoot); }
</ins><span class="cx">
</span><span class="cx"> NamedNodeMap* attributeMap() const { return m_attributeMap.get(); }
</span><span class="cx"> void setAttributeMap(std::unique_ptr<NamedNodeMap> attributeMap) { m_attributeMap = WTF::move(attributeMap); }
</span><span class="lines">@@ -189,16 +188,16 @@
</span><span class="cx"> ASSERT(!m_afterPseudoElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void ElementRareData::setBeforePseudoElement(PassRefPtr<PseudoElement> pseudoElement)
</del><ins>+inline void ElementRareData::setBeforePseudoElement(RefPtr<PseudoElement>&& pseudoElement)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_beforePseudoElement || !pseudoElement);
</span><del>- m_beforePseudoElement = pseudoElement;
</del><ins>+ m_beforePseudoElement = WTF::move(pseudoElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline void ElementRareData::setAfterPseudoElement(PassRefPtr<PseudoElement> pseudoElement)
</del><ins>+inline void ElementRareData::setAfterPseudoElement(RefPtr<PseudoElement>&& pseudoElement)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_afterPseudoElement || !pseudoElement);
</span><del>- m_afterPseudoElement = pseudoElement;
</del><ins>+ m_afterPseudoElement = WTF::move(pseudoElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void ElementRareData::resetComputedStyle()
</span></span></pre></div>
<a id="trunkSourceWebCoredomPseudoElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/PseudoElement.h (177750 => 177751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/PseudoElement.h 2014-12-26 22:16:30 UTC (rev 177750)
+++ trunk/Source/WebCore/dom/PseudoElement.h 2014-12-26 23:00:04 UTC (rev 177751)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx">
</span><span class="cx"> class PseudoElement final : public Element {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<PseudoElement> create(Element& host, PseudoId pseudoId)
</del><ins>+ static Ref<PseudoElement> create(Element& host, PseudoId pseudoId)
</ins><span class="cx"> {
</span><del>- return adoptRef(new PseudoElement(host, pseudoId));
</del><ins>+ return adoptRef(*new PseudoElement(host, pseudoId));
</ins><span class="cx"> }
</span><span class="cx"> virtual ~PseudoElement();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (177750 => 177751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h 2014-12-26 22:16:30 UTC (rev 177750)
+++ trunk/Source/WebCore/dom/ShadowRoot.h 2014-12-26 23:00:04 UTC (rev 177751)
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx"> UserAgentShadowRoot = 0,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static PassRefPtr<ShadowRoot> create(Document& document, ShadowRootType type)
</del><ins>+ static Ref<ShadowRoot> create(Document& document, ShadowRootType type)
</ins><span class="cx"> {
</span><del>- return adoptRef(new ShadowRoot(document, type));
</del><ins>+ return adoptRef(*new ShadowRoot(document, type));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~ShadowRoot();
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (177750 => 177751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-12-26 22:16:30 UTC (rev 177750)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-12-26 23:00:04 UTC (rev 177751)
</span><span class="lines">@@ -532,14 +532,14 @@
</span><span class="cx"> return current.afterPseudoElement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void setBeforeOrAfterPseudoElement(Element& current, PassRefPtr<PseudoElement> pseudoElement, PseudoId pseudoId)
</del><ins>+static void setBeforeOrAfterPseudoElement(Element& current, Ref<PseudoElement>&& pseudoElement, PseudoId pseudoId)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(pseudoId == BEFORE || pseudoId == AFTER);
</span><span class="cx"> if (pseudoId == BEFORE) {
</span><del>- current.setBeforePseudoElement(pseudoElement);
</del><ins>+ current.setBeforePseudoElement(WTF::move(pseudoElement));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- current.setAfterPseudoElement(pseudoElement);
</del><ins>+ current.setAfterPseudoElement(WTF::move(pseudoElement));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void clearBeforeOrAfterPseudoElement(Element& current, PseudoId pseudoId)
</span><span class="lines">@@ -592,9 +592,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!needsPseudoElement(current, pseudoId))
</span><span class="cx"> return;
</span><del>- RefPtr<PseudoElement> pseudoElement = PseudoElement::create(current, pseudoId);
- setBeforeOrAfterPseudoElement(current, pseudoElement, pseudoId);
- attachRenderTree(*pseudoElement, *current.renderStyle(), renderTreePosition, nullptr);
</del><ins>+ Ref<PseudoElement> pseudoElement = PseudoElement::create(current, pseudoId);
+ setBeforeOrAfterPseudoElement(current, pseudoElement.copyRef(), pseudoId);
+ attachRenderTree(pseudoElement.get(), *current.renderStyle(), renderTreePosition, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void attachRenderTree(Element& current, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition, PassRefPtr<RenderStyle> resolvedStyle)
</span></span></pre>
</div>
</div>
</body>
</html>