| Index: Source/core/frame/FrameView.cpp
|
| diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
|
| index 4e719fadf1885786b6d23ca9d7aecd67e5b6e49c..e4b516cfe5339a4d857ed7f6b7ca924a3046f6ec 100644
|
| --- a/Source/core/frame/FrameView.cpp
|
| +++ b/Source/core/frame/FrameView.cpp
|
| @@ -1798,7 +1798,9 @@ void FrameView::scheduleRelayout()
|
| if (m_hasPendingLayout)
|
| return;
|
| m_hasPendingLayout = true;
|
| +
|
| page()->animator().scheduleVisualUpdate();
|
| + lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean);
|
| }
|
|
|
| static bool isObjectAncestorContainerOf(RenderObject* ancestor, RenderObject* descendant)
|
| @@ -1814,6 +1816,10 @@ void FrameView::scheduleRelayoutOfSubtree(RenderObject* relayoutRoot)
|
| {
|
| ASSERT(m_frame->view() == this);
|
|
|
| + // FIXME: Should this call shouldScheduleLayout instead?
|
| + if (!m_frame->document()->isActive())
|
| + return;
|
| +
|
| RenderView* renderView = this->renderView();
|
| if (renderView && renderView->needsLayout()) {
|
| if (relayoutRoot)
|
| @@ -1847,7 +1853,9 @@ void FrameView::scheduleRelayoutOfSubtree(RenderObject* relayoutRoot)
|
| ASSERT(!m_layoutSubtreeRoot->container() || !m_layoutSubtreeRoot->container()->needsLayout());
|
| InspectorInstrumentation::didInvalidateLayout(m_frame.get());
|
| m_hasPendingLayout = true;
|
| +
|
| page()->animator().scheduleVisualUpdate();
|
| + lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean);
|
| }
|
| }
|
|
|
|
|