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

Unified Diff: Source/core/frame/DeprecatedScheduleStyleRecalcDuringLayout.cpp

Issue 232013002: Rewind the DocumentLifecycle when dirtying state (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address Ojan's comments 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/frame/DeprecatedScheduleStyleRecalcDuringLayout.cpp
diff --git a/Source/core/frame/DeprecatedScheduleStyleRecalcDuringLayout.cpp b/Source/core/frame/DeprecatedScheduleStyleRecalcDuringLayout.cpp
index 94367d821680aac14467d1f1de7bd75adab1289a..88f35ae44ee62109cca433ad1d1aea43a400fddc 100644
--- a/Source/core/frame/DeprecatedScheduleStyleRecalcDuringLayout.cpp
+++ b/Source/core/frame/DeprecatedScheduleStyleRecalcDuringLayout.cpp
@@ -11,7 +11,7 @@ namespace WebCore {
DeprecatedScheduleStyleRecalcDuringLayout::DeprecatedScheduleStyleRecalcDuringLayout(DocumentLifecycle& lifecycle)
: m_lifecycle(lifecycle)
- , m_deprecatedTransition(DocumentLifecycle::InPerformLayout, DocumentLifecycle::StyleRecalcPending)
+ , m_deprecatedTransition(DocumentLifecycle::InPerformLayout, DocumentLifecycle::VisualUpdatePending)
, m_wasInPerformLayout(lifecycle.state() == DocumentLifecycle::InPerformLayout)
{
}
@@ -21,7 +21,7 @@ DeprecatedScheduleStyleRecalcDuringLayout::~DeprecatedScheduleStyleRecalcDuringL
// This block of code is intended to restore the state machine to the
// proper state. The style recalc will still have been schedule, however.
if (m_wasInPerformLayout && m_lifecycle.state() != DocumentLifecycle::InPerformLayout) {
- ASSERT(m_lifecycle.state() == DocumentLifecycle::StyleRecalcPending);
+ ASSERT(m_lifecycle.state() == DocumentLifecycle::VisualUpdatePending);
m_lifecycle.advanceTo(DocumentLifecycle::InPerformLayout);
}
}
« no previous file with comments | « Source/core/frame/DeprecatedScheduleStyleRecalcDuringCompositingUpdate.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698