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

Unified Diff: Source/core/dom/Element.cpp

Issue 265793017: Oilpan: move node/element rare data objects to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased + assert for Nodes having no renderer on destruction. Created 6 years, 8 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
Index: Source/core/dom/Element.cpp
diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
index 08b8d3ed6a9655b519f22145c83b2d22850a822c..a93fdc4b3f67b54af5227a44a99687ff1c6ec3d9 100644
--- a/Source/core/dom/Element.cpp
+++ b/Source/core/dom/Element.cpp
@@ -167,11 +167,10 @@ Element::~Element()
{
ASSERT(needsAttach());
+#if !ENABLE(OILPAN)
if (hasRareData())
elementRareData()->clearShadow();
-
- if (hasActiveAnimations())
- activeAnimations()->dispose();
Erik Corry 2014/05/05 09:31:27 It seems this could be kept inside the ifdef inste
sof 2014/05/05 13:38:58 Sorry, but this explicit dispose() call was a very
+#endif
if (isCustomElement())
CustomElement::wasDestroyed(this);
@@ -1430,7 +1429,7 @@ void Element::detach(const AttachContext& context)
if (ActiveAnimations* activeAnimations = data->activeAnimations()) {
if (context.performingReattach) {
- // FIXME: We call detach from withing style recalc, so compositingState is not up to date.
+ // FIXME: We call detach from within style recalc, so compositingState is not up to date.
// https://code.google.com/p/chromium/issues/detail?id=339847
DisableCompositingQueryAsserts disabler;

Powered by Google App Engine
This is Rietveld 408576698