<!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>[207374] 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/207374">207374</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-10-15 07:24:33 -0700 (Sat, 15 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>CounterNode::resetRenderers is so inefficient.
https://bugs.webkit.org/show_bug.cgi?id=163480
Reviewed by Simon Fraser.
CounterNode::resetRenderers() removes all the associated renderers from this CounterNode
and sets the dirty bit on them.
This patch does all that in a loop, instead of traversing the linked tree on each removal.
No change in functionality.
* rendering/CounterNode.cpp:
(WebCore::CounterNode::CounterNode):
(WebCore::CounterNode::~CounterNode):
(WebCore::CounterNode::nextInPreOrderAfterChildren):
(WebCore::CounterNode::lastDescendant):
(WebCore::CounterNode::addRenderer): These assertions do not seem super useful.
(WebCore::CounterNode::removeRenderer):
(WebCore::CounterNode::resetRenderers):
(WebCore::CounterNode::insertAfter):
(WebCore::CounterNode::removeChild):
* rendering/CounterNode.h:
* rendering/RenderCounter.cpp:
(WebCore::makeCounterNode):
(WebCore::RenderCounter::RenderCounter):
(WebCore::RenderCounter::~RenderCounter):
(WebCore::RenderCounter::originalText):
(WebCore::updateCounters):
(WebCore::RenderCounter::invalidate): Deleted.
* rendering/RenderCounter.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingCounterNodecpp">trunk/Source/WebCore/rendering/CounterNode.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingCounterNodeh">trunk/Source/WebCore/rendering/CounterNode.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCountercpp">trunk/Source/WebCore/rendering/RenderCounter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCounterh">trunk/Source/WebCore/rendering/RenderCounter.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207373 => 207374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-15 09:15:41 UTC (rev 207373)
+++ trunk/Source/WebCore/ChangeLog 2016-10-15 14:24:33 UTC (rev 207374)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-10-15 Zalan Bujtas <zalan@apple.com>
+
+ CounterNode::resetRenderers is so inefficient.
+ https://bugs.webkit.org/show_bug.cgi?id=163480
+
+ Reviewed by Simon Fraser.
+
+ CounterNode::resetRenderers() removes all the associated renderers from this CounterNode
+ and sets the dirty bit on them.
+ This patch does all that in a loop, instead of traversing the linked tree on each removal.
+
+ No change in functionality.
+
+ * rendering/CounterNode.cpp:
+ (WebCore::CounterNode::CounterNode):
+ (WebCore::CounterNode::~CounterNode):
+ (WebCore::CounterNode::nextInPreOrderAfterChildren):
+ (WebCore::CounterNode::lastDescendant):
+ (WebCore::CounterNode::addRenderer): These assertions do not seem super useful.
+ (WebCore::CounterNode::removeRenderer):
+ (WebCore::CounterNode::resetRenderers):
+ (WebCore::CounterNode::insertAfter):
+ (WebCore::CounterNode::removeChild):
+ * rendering/CounterNode.h:
+ * rendering/RenderCounter.cpp:
+ (WebCore::makeCounterNode):
+ (WebCore::RenderCounter::RenderCounter):
+ (WebCore::RenderCounter::~RenderCounter):
+ (WebCore::RenderCounter::originalText):
+ (WebCore::updateCounters):
+ (WebCore::RenderCounter::invalidate): Deleted.
+ * rendering/RenderCounter.h:
+
</ins><span class="cx"> 2016-10-15 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] macOS inline controls
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingCounterNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/CounterNode.cpp (207373 => 207374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/CounterNode.cpp 2016-10-15 09:15:41 UTC (rev 207373)
+++ trunk/Source/WebCore/rendering/CounterNode.cpp 2016-10-15 14:24:33 UTC (rev 207374)
</span><span class="lines">@@ -33,12 +33,6 @@
</span><span class="cx"> , m_value(value)
</span><span class="cx"> , m_countInParent(0)
</span><span class="cx"> , m_owner(owner)
</span><del>- , m_rootRenderer(0)
- , m_parent(0)
- , m_previousSibling(0)
- , m_nextSibling(0)
- , m_firstChild(0)
- , m_lastChild(0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -47,8 +41,8 @@
</span><span class="cx"> // Ideally this would be an assert and this would never be reached. In reality this happens a lot
</span><span class="cx"> // so we need to handle these cases. The node is still connected to the tree so we need to detach it.
</span><span class="cx"> if (m_parent || m_previousSibling || m_nextSibling || m_firstChild || m_lastChild) {
</span><del>- CounterNode* oldParent = 0;
- CounterNode* oldPreviousSibling = 0;
</del><ins>+ CounterNode* oldParent = nullptr;
+ CounterNode* oldPreviousSibling = nullptr;
</ins><span class="cx"> // Instead of calling removeChild() we do this safely as the tree is likely broken if we get here.
</span><span class="cx"> if (m_parent) {
</span><span class="cx"> if (m_parent->m_firstChild == this)
</span><span class="lines">@@ -56,24 +50,24 @@
</span><span class="cx"> if (m_parent->m_lastChild == this)
</span><span class="cx"> m_parent->m_lastChild = m_previousSibling;
</span><span class="cx"> oldParent = m_parent;
</span><del>- m_parent = 0;
</del><ins>+ m_parent = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (m_previousSibling) {
</span><span class="cx"> if (m_previousSibling->m_nextSibling == this)
</span><span class="cx"> m_previousSibling->m_nextSibling = m_nextSibling;
</span><span class="cx"> oldPreviousSibling = m_previousSibling;
</span><del>- m_previousSibling = 0;
</del><ins>+ m_previousSibling = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (m_nextSibling) {
</span><span class="cx"> if (m_nextSibling->m_previousSibling == this)
</span><span class="cx"> m_nextSibling->m_previousSibling = oldPreviousSibling;
</span><del>- m_nextSibling = 0;
</del><ins>+ m_nextSibling = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (m_firstChild) {
</span><span class="cx"> // The node's children are reparented to the old parent.
</span><span class="cx"> for (CounterNode* child = m_firstChild; child; ) {
</span><span class="cx"> CounterNode* nextChild = child->m_nextSibling;
</span><del>- CounterNode* nextSibling = 0;
</del><ins>+ CounterNode* nextSibling = nullptr;
</ins><span class="cx"> child->m_parent = oldParent;
</span><span class="cx"> if (oldPreviousSibling) {
</span><span class="cx"> nextSibling = oldPreviousSibling->m_nextSibling;
</span><span class="lines">@@ -98,7 +92,7 @@
</span><span class="cx"> CounterNode* CounterNode::nextInPreOrderAfterChildren(const CounterNode* stayWithin) const
</span><span class="cx"> {
</span><span class="cx"> if (this == stayWithin)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> const CounterNode* current = this;
</span><span class="cx"> CounterNode* next;
</span><span class="lines">@@ -105,7 +99,7 @@
</span><span class="cx"> while (!(next = current->m_nextSibling)) {
</span><span class="cx"> current = current->m_parent;
</span><span class="cx"> if (!current || current == stayWithin)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> return next;
</span><span class="cx"> }
</span><span class="lines">@@ -122,7 +116,7 @@
</span><span class="cx"> {
</span><span class="cx"> CounterNode* last = m_lastChild;
</span><span class="cx"> if (!last)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> while (CounterNode* lastChild = last->m_lastChild)
</span><span class="cx"> last = lastChild;
</span><span class="lines">@@ -151,64 +145,49 @@
</span><span class="cx"> return m_parent->m_value + increment;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CounterNode::addRenderer(RenderCounter* value)
</del><ins>+void CounterNode::addRenderer(RenderCounter& renderer)
</ins><span class="cx"> {
</span><del>- if (!value) {
- ASSERT_NOT_REACHED();
- return;
- }
- if (value->m_counterNode) {
- ASSERT_NOT_REACHED();
- value->m_counterNode->removeRenderer(value);
- }
- ASSERT(!value->m_nextForSameCounter);
- for (RenderCounter* iterator = m_rootRenderer;iterator; iterator = iterator->m_nextForSameCounter) {
- if (iterator == value) {
- ASSERT_NOT_REACHED();
- return;
- }
- }
- value->m_nextForSameCounter = m_rootRenderer;
- m_rootRenderer = value;
- if (value->m_counterNode != this) {
- if (value->m_counterNode) {
- ASSERT_NOT_REACHED();
- value->m_counterNode->removeRenderer(value);
- }
- value->m_counterNode = this;
- }
</del><ins>+ ASSERT(!renderer.m_counterNode);
+ ASSERT(!renderer.m_nextForSameCounter);
+ renderer.m_nextForSameCounter = m_rootRenderer;
+ m_rootRenderer = &renderer;
+ renderer.m_counterNode = this;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CounterNode::removeRenderer(RenderCounter* value)
</del><ins>+void CounterNode::removeRenderer(RenderCounter& renderer)
</ins><span class="cx"> {
</span><del>- if (!value) {
- ASSERT_NOT_REACHED();
</del><ins>+ ASSERT(renderer.m_counterNode && renderer.m_counterNode == this);
+ RenderCounter* previous = nullptr;
+ for (auto* current = m_rootRenderer; current; previous = current, current = current->m_nextForSameCounter) {
+ if (current != &renderer)
+ continue;
+
+ if (previous)
+ previous->m_nextForSameCounter = renderer.m_nextForSameCounter;
+ else
+ m_rootRenderer = renderer.m_nextForSameCounter;
+ renderer.m_nextForSameCounter = nullptr;
+ renderer.m_counterNode = nullptr;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (value->m_counterNode && value->m_counterNode != this) {
- ASSERT_NOT_REACHED();
- value->m_counterNode->removeRenderer(value);
- }
- RenderCounter* previous = 0;
- for (RenderCounter* iterator = m_rootRenderer;iterator; iterator = iterator->m_nextForSameCounter) {
- if (iterator == value) {
- if (previous)
- previous->m_nextForSameCounter = value->m_nextForSameCounter;
- else
- m_rootRenderer = value->m_nextForSameCounter;
- value->m_nextForSameCounter = 0;
- value->m_counterNode = 0;
- return;
- }
- previous = iterator;
- }
</del><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CounterNode::resetRenderers()
</span><span class="cx"> {
</span><del>- while (m_rootRenderer)
- m_rootRenderer->invalidate(); // This makes m_rootRenderer point to the next renderer if any since it disconnects the m_rootRenderer from this.
</del><ins>+ if (!m_rootRenderer)
+ return;
+ bool skipLayoutAndPerfWidthsRecalc = m_rootRenderer->documentBeingDestroyed();
+ auto* current = m_rootRenderer;
+ while (current) {
+ if (!skipLayoutAndPerfWidthsRecalc)
+ current->setNeedsLayoutAndPrefWidthsRecalc();
+ auto* next = current->m_nextForSameCounter;
+ current->m_nextForSameCounter = nullptr;
+ current->m_counterNode = nullptr;
+ current = next;
+ }
+ m_rootRenderer = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CounterNode::resetThisAndDescendantsRenderers()
</span><span class="lines">@@ -312,8 +291,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- newChild->m_firstChild = 0;
- newChild->m_lastChild = 0;
</del><ins>+ newChild->m_firstChild = nullptr;
+ newChild->m_lastChild = nullptr;
</ins><span class="cx"> newChild->m_countInParent = newChild->computeCountInParent();
</span><span class="cx"> newChild->resetRenderers();
</span><span class="cx"> first->recount();
</span><span class="lines">@@ -328,9 +307,9 @@
</span><span class="cx"> CounterNode* next = oldChild->m_nextSibling;
</span><span class="cx"> CounterNode* previous = oldChild->m_previousSibling;
</span><span class="cx">
</span><del>- oldChild->m_nextSibling = 0;
- oldChild->m_previousSibling = 0;
- oldChild->m_parent = 0;
</del><ins>+ oldChild->m_nextSibling = nullptr;
+ oldChild->m_previousSibling = nullptr;
+ oldChild->m_parent = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (previous)
</span><span class="cx"> previous->m_nextSibling = next;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingCounterNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/CounterNode.h (207373 => 207374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/CounterNode.h 2016-10-15 09:15:41 UTC (rev 207373)
+++ trunk/Source/WebCore/rendering/CounterNode.h 2016-10-15 14:24:33 UTC (rev 207374)
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx"> int value() const { return m_value; }
</span><span class="cx"> int countInParent() const { return m_countInParent; }
</span><span class="cx"> RenderElement& owner() const { return m_owner; }
</span><del>- void addRenderer(RenderCounter*);
- void removeRenderer(RenderCounter*);
</del><ins>+ void addRenderer(RenderCounter&);
+ void removeRenderer(RenderCounter&);
</ins><span class="cx">
</span><span class="cx"> // Invalidates the text in the renderers of this counter, if any.
</span><span class="cx"> void resetRenderers();
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx"> CounterNode* lastChild() const { return m_lastChild; }
</span><span class="cx"> CounterNode* lastDescendant() const;
</span><span class="cx"> CounterNode* previousInPreOrder() const;
</span><del>- CounterNode* nextInPreOrder(const CounterNode* stayWithin = 0) const;
- CounterNode* nextInPreOrderAfterChildren(const CounterNode* stayWithin = 0) const;
</del><ins>+ CounterNode* nextInPreOrder(const CounterNode* stayWithin = nullptr) const;
+ CounterNode* nextInPreOrderAfterChildren(const CounterNode* stayWithin = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> void insertAfter(CounterNode* newChild, CounterNode* beforeChild, const AtomicString& identifier);
</span><span class="cx">
</span><span class="lines">@@ -82,13 +82,13 @@
</span><span class="cx"> int m_value;
</span><span class="cx"> int m_countInParent;
</span><span class="cx"> RenderElement& m_owner;
</span><del>- RenderCounter* m_rootRenderer;
</del><ins>+ RenderCounter* m_rootRenderer { nullptr };
</ins><span class="cx">
</span><del>- CounterNode* m_parent;
- CounterNode* m_previousSibling;
- CounterNode* m_nextSibling;
- CounterNode* m_firstChild;
- CounterNode* m_lastChild;
</del><ins>+ CounterNode* m_parent { nullptr };
+ CounterNode* m_previousSibling { nullptr };
+ CounterNode* m_nextSibling { nullptr };
+ CounterNode* m_firstChild { nullptr };
+ CounterNode* m_lastChild { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCountercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCounter.cpp (207373 => 207374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCounter.cpp 2016-10-15 09:15:41 UTC (rev 207373)
+++ trunk/Source/WebCore/rendering/RenderCounter.cpp 2016-10-15 14:24:33 UTC (rev 207374)
</span><span class="lines">@@ -304,8 +304,8 @@
</span><span class="cx"> if (!planCounter(renderer, identifier, isReset, value) && !alwaysCreateCounter)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<CounterNode> newParent = 0;
- RefPtr<CounterNode> newPreviousSibling = 0;
</del><ins>+ RefPtr<CounterNode> newParent;
+ RefPtr<CounterNode> newPreviousSibling;
</ins><span class="cx"> RefPtr<CounterNode> newNode = CounterNode::create(renderer, isReset, value);
</span><span class="cx"> if (findPlaceForCounter(renderer, identifier, isReset, newParent, newPreviousSibling))
</span><span class="cx"> newParent->insertAfter(newNode.get(), newPreviousSibling.get(), identifier);
</span><span class="lines">@@ -345,8 +345,6 @@
</span><span class="cx"> RenderCounter::RenderCounter(Document& document, const CounterContent& counter)
</span><span class="cx"> : RenderText(document, emptyString())
</span><span class="cx"> , m_counter(counter)
</span><del>- , m_counterNode(nullptr)
- , m_nextForSameCounter(0)
</del><span class="cx"> {
</span><span class="cx"> view().addRenderCounter();
</span><span class="cx"> }
</span><span class="lines">@@ -356,7 +354,7 @@
</span><span class="cx"> view().removeRenderCounter();
</span><span class="cx">
</span><span class="cx"> if (m_counterNode) {
</span><del>- m_counterNode->removeRenderer(this);
</del><ins>+ m_counterNode->removeRenderer(*this);
</ins><span class="cx"> ASSERT(!m_counterNode);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -385,7 +383,7 @@
</span><span class="cx"> break;
</span><span class="cx"> beforeAfterContainer = beforeAfterContainer->parent();
</span><span class="cx"> }
</span><del>- makeCounterNode(*beforeAfterContainer, m_counter.identifier(), true)->addRenderer(const_cast<RenderCounter*>(this));
</del><ins>+ makeCounterNode(*beforeAfterContainer, m_counter.identifier(), true)->addRenderer(const_cast<RenderCounter&>(*this));
</ins><span class="cx"> ASSERT(m_counterNode);
</span><span class="cx"> }
</span><span class="cx"> CounterNode* child = m_counterNode;
</span><span class="lines">@@ -427,15 +425,6 @@
</span><span class="cx"> RenderText::computePreferredLogicalWidths(lead);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderCounter::invalidate()
-{
- m_counterNode->removeRenderer(this);
- ASSERT(!m_counterNode);
- if (documentBeingDestroyed())
- return;
- setNeedsLayoutAndPrefWidthsRecalc();
-}
-
</del><span class="cx"> static void destroyCounterNodeWithoutMapRemoval(const AtomicString& identifier, CounterNode* node)
</span><span class="cx"> {
</span><span class="cx"> CounterNode* previous;
</span><span class="lines">@@ -522,8 +511,8 @@
</span><span class="cx"> makeCounterNode(renderer, it->key, false);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- RefPtr<CounterNode> newParent = 0;
- RefPtr<CounterNode> newPreviousSibling = 0;
</del><ins>+ RefPtr<CounterNode> newParent;
+ RefPtr<CounterNode> newPreviousSibling;
</ins><span class="cx">
</span><span class="cx"> findPlaceForCounter(renderer, it->key, node->hasResetType(), newParent, newPreviousSibling);
</span><span class="cx"> if (node != counterMap->get(it->key))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCounterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCounter.h (207373 => 207374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCounter.h 2016-10-15 09:15:41 UTC (rev 207373)
+++ trunk/Source/WebCore/rendering/RenderCounter.h 2016-10-15 14:24:33 UTC (rev 207374)
</span><span class="lines">@@ -49,13 +49,9 @@
</span><span class="cx">
</span><span class="cx"> void computePreferredLogicalWidths(float leadWidth) override;
</span><span class="cx">
</span><del>- // Removes the reference to the CounterNode associated with this renderer.
- // This is used to cause a counter display update when the CounterNode tree changes.
- void invalidate();
-
</del><span class="cx"> CounterContent m_counter;
</span><del>- CounterNode* m_counterNode;
- RenderCounter* m_nextForSameCounter;
</del><ins>+ CounterNode* m_counterNode { nullptr };
+ RenderCounter* m_nextForSameCounter { nullptr };
</ins><span class="cx"> friend class CounterNode;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -65,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><del>-void showCounterRendererTree(const WebCore::RenderObject*, const char* counterName = 0);
</del><ins>+void showCounterRendererTree(const WebCore::RenderObject*, const char* counterName = nullptr);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif // RenderCounter_h
</span></span></pre>
</div>
</div>
</body>
</html>