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

Unified Diff: Source/core/animation/ElementAnimations.cpp

Issue 1001323003: Temporarily disable baseLayoutStyle optimization. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/ElementAnimations.cpp
diff --git a/Source/core/animation/ElementAnimations.cpp b/Source/core/animation/ElementAnimations.cpp
index 86500eca222de8ac8b5f370b13498a3558e4425b..9a725ca4bbb0d21a375e4ab181a5d0453848a0af 100644
--- a/Source/core/animation/ElementAnimations.cpp
+++ b/Source/core/animation/ElementAnimations.cpp
@@ -92,10 +92,6 @@ DEFINE_TRACE(ElementAnimations)
const LayoutStyle* ElementAnimations::baseLayoutStyle() const
{
-#if !ENABLE(ASSERT)
- if (isAnimationStyleChange())
- return m_baseLayoutStyle.get();
-#endif
return nullptr;
}
@@ -105,10 +101,10 @@ void ElementAnimations::updateBaseLayoutStyle(const LayoutStyle* layoutStyle)
m_baseLayoutStyle = nullptr;
return;
}
-#if ENABLE(ASSERT)
- if (m_baseLayoutStyle && layoutStyle)
- ASSERT(*m_baseLayoutStyle == *layoutStyle);
-#endif
+ if (m_baseLayoutStyle && layoutStyle) {
+ RELEASE_ASSERT(*m_baseLayoutStyle == *layoutStyle);
+ return;
+ }
m_baseLayoutStyle = LayoutStyle::clone(*layoutStyle);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698