| Index: Source/core/page/FrameView.cpp
|
| diff --git a/Source/core/page/FrameView.cpp b/Source/core/page/FrameView.cpp
|
| index 8ff98d3bef09f7fdc669210827a202239ef35394..44679fc6812b7aadb0e56fd2deb5f96d50d6bc8a 100644
|
| --- a/Source/core/page/FrameView.cpp
|
| +++ b/Source/core/page/FrameView.cpp
|
| @@ -249,7 +249,6 @@ void FrameView::reset()
|
| m_borderY = 30;
|
| m_layoutTimer.stop();
|
| m_layoutRoot = 0;
|
| - m_delayedLayout = false;
|
| m_doFullRepaint = true;
|
| m_layoutSchedulingEnabled = true;
|
| m_inLayout = false;
|
| @@ -880,7 +879,6 @@ void FrameView::layout(bool allowSubtree)
|
| TemporaryChange<bool> changeInProgrammaticScroll(m_inProgrammaticScroll, true);
|
|
|
| m_layoutTimer.stop();
|
| - m_delayedLayout = false;
|
| m_setNeedsLayoutWasDeferred = false;
|
|
|
| // we shouldn't enter layout() while painting
|
| @@ -1893,14 +1891,10 @@ void FrameView::scheduleRelayout()
|
| if (m_frame->ownerRenderer() && frame()->document()->shouldDisplaySeamlesslyWithParent())
|
| m_frame->ownerRenderer()->setNeedsLayout(true, MarkContainingBlockChain);
|
|
|
| - int delay = m_frame->document()->minimumLayoutDelay();
|
| - if (m_layoutTimer.isActive() && m_delayedLayout && !delay)
|
| - unscheduleRelayout();
|
| if (m_layoutTimer.isActive())
|
| return;
|
|
|
| - m_delayedLayout = delay != 0;
|
| - m_layoutTimer.startOneShot(delay * 0.001);
|
| + m_layoutTimer.startOneShot(0);
|
| }
|
|
|
| static bool isObjectAncestorContainerOf(RenderObject* ancestor, RenderObject* descendant)
|
| @@ -1945,12 +1939,10 @@ void FrameView::scheduleRelayoutOfSubtree(RenderObject* relayoutRoot)
|
| }
|
| }
|
| } else if (m_layoutSchedulingEnabled) {
|
| - int delay = m_frame->document()->minimumLayoutDelay();
|
| m_layoutRoot = relayoutRoot;
|
| ASSERT(!m_layoutRoot->container() || !m_layoutRoot->container()->needsLayout());
|
| InspectorInstrumentation::didInvalidateLayout(m_frame.get());
|
| - m_delayedLayout = delay != 0;
|
| - m_layoutTimer.startOneShot(delay * 0.001);
|
| + m_layoutTimer.startOneShot(0);
|
| }
|
| }
|
|
|
| @@ -1991,7 +1983,6 @@ void FrameView::unscheduleRelayout()
|
| return;
|
|
|
| m_layoutTimer.stop();
|
| - m_delayedLayout = false;
|
| }
|
|
|
| void FrameView::serviceScriptedAnimations(double monotonicAnimationStartTime)
|
|
|