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

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: Implement a weak-like Node reference from a MO registration object Created 6 years, 7 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 2dfd3d91defb86c417803b23c919b68135a85f40..3cdd12a1dd9a64e4602eea7fd6af7971222e95e9 100644
--- a/Source/core/dom/Element.cpp
+++ b/Source/core/dom/Element.cpp
@@ -168,11 +168,10 @@ Element::~Element()
{
ASSERT(needsAttach());
+#if !ENABLE(OILPAN)
if (hasRareData())
elementRareData()->clearShadow();
-
- if (hasActiveAnimations())
- activeAnimations()->dispose();
+#endif
if (isCustomElement())
CustomElement::wasDestroyed(this);
@@ -1431,7 +1430,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