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

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

Issue 150423004: Move Document::m_inStyleRecalc into DocumentLifecycle (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename state Created 6 years, 11 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 | « Source/core/dom/DocumentLifecycle.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/DocumentLifecycle.cpp
diff --git a/Source/core/dom/DocumentLifecycle.cpp b/Source/core/dom/DocumentLifecycle.cpp
index 157548f32b023d0de8923702c445c9ba2b6f664d..c6b52d66c166c36b2ecf6c683df94dbf04d33cf9 100644
--- a/Source/core/dom/DocumentLifecycle.cpp
+++ b/Source/core/dom/DocumentLifecycle.cpp
@@ -48,7 +48,7 @@ void DocumentLifecycle::advanceTo(State state)
{
// FIXME: We can dispose a document multiple times. This seems wrong.
// See https://code.google.com/p/chromium/issues/detail?id=301668.
- ASSERT(state > m_state || (state == Disposed && m_state == Disposed));
+ ASSERT(state > m_state || (state == Disposed && m_state == Disposed) || (isActive() && state == Clean));
m_state = state;
}
« no previous file with comments | « Source/core/dom/DocumentLifecycle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698