| 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 7b2e3eca49d6027462409a36245261c844a251ee..5c51f1e212998dd760c4f4724ec035449ebceab5 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -2562,6 +2562,11 @@ void FrameView::notifyResizeObservers()
|
| // TODO(leviw): We don't assert lifecycle information from documents in child PluginViews.
|
| void FrameView::updateLifecyclePhasesInternal(DocumentLifecycle::LifecycleState targetState)
|
| {
|
| + if (m_currentUpdateLifecyclePhasesTargetState != DocumentLifecycle::Uninitialized) {
|
| + NOTREACHED() << "FrameView::updateLifecyclePhasesInternal() reentrance";
|
| + return;
|
| + }
|
| +
|
| // This must be called from the root frame, since it recurses down, not up.
|
| // Otherwise the lifecycles of the frames might be out of sync.
|
| DCHECK(m_frame->isLocalRoot());
|
|
|