Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Unified Diff: third_party/WebKit/Source/core/dom/Node.cpp

Issue 2380503002: Revert of Storage of ComputedStyle separate from LayoutObject. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed conflicts Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/dom/Node.h ('k') | third_party/WebKit/Source/core/dom/NodeComputedStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/Node.cpp
diff --git a/third_party/WebKit/Source/core/dom/Node.cpp b/third_party/WebKit/Source/core/dom/Node.cpp
index 38f5f24e2bb93822eaa63c9ce7c42198ac2e5778..cf0b32333f04e8690a92d6bdf98790d80c79184c 100644
--- a/third_party/WebKit/Source/core/dom/Node.cpp
+++ b/third_party/WebKit/Source/core/dom/Node.cpp
@@ -272,8 +272,6 @@ Node::~Node()
// this condition (we cannot directly access it here.)
RELEASE_ASSERT(hasRareData() || !layoutObject());
InstanceCounters::decrementCounter(InstanceCounters::NodeCounter);
- if (!hasRareData() && m_data.m_computedStyle)
- m_data.m_computedStyle->deref();
}
NodeRareData* Node::rareData() const
@@ -288,9 +286,9 @@ NodeRareData& Node::ensureRareData()
return *rareData();
if (isElementNode())
- m_data.m_rareData = ElementRareData::create(layoutObject());
+ m_data.m_rareData = ElementRareData::create(m_data.m_layoutObject);
else
- m_data.m_rareData = NodeRareData::create(layoutObject());
+ m_data.m_rareData = NodeRareData::create(m_data.m_layoutObject);
DCHECK(m_data.m_rareData);
« no previous file with comments | « third_party/WebKit/Source/core/dom/Node.h ('k') | third_party/WebKit/Source/core/dom/NodeComputedStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698