| 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
|
|
|