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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 1562293002: Remove FrameView::m_inPerformLayout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 751d7fbc54fe6d686ae3dfce1f3aa58535b4cab5..9502a49d52289598078e724aaa0bfd23afd700b4 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -204,7 +204,6 @@ void FrameView::reset()
m_hasPendingLayout = false;
m_doFullPaintInvalidation = false;
m_layoutSchedulingEnabled = true;
- m_inPerformLayout = false;
m_inSynchronousPostLayout = false;
m_layoutCount = 0;
m_nestedLayoutCount = 0;
@@ -825,8 +824,6 @@ void FrameView::performLayout(bool inSubtreeLayout)
ASSERT(!isInPerformLayout());
lifecycle().advanceTo(DocumentLifecycle::InPerformLayout);
- TemporaryChange<bool> changeInPerformLayout(m_inPerformLayout, true);
-
// performLayout is the actual guts of layout().
// FIXME: The 300 other lines in layout() probably belong in other helper functions
// so that a single human could understand what layout() is actually doing.
@@ -1766,8 +1763,7 @@ bool FrameView::layoutPending() const
bool FrameView::isInPerformLayout() const
{
- ASSERT(m_inPerformLayout == (lifecycle().state() == DocumentLifecycle::InPerformLayout));
- return m_inPerformLayout;
+ return lifecycle().state() == DocumentLifecycle::InPerformLayout;
}
bool FrameView::needsLayout() const
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698