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 28f16070705b806c73c9fb0d64247bae852ef067..0efcf584d5a7f5ce76b9502073eed3e90fb4baf2 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()); |