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 de49f4bed8fe9b65c1d2548956bca675c16783dc..bc6151fb3e288ca8fa17b031db80d39ad30bac7d 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -91,6 +91,7 @@ |
#include "platform/graphics/GraphicsContext.h" |
#include "platform/graphics/GraphicsLayer.h" |
#include "platform/graphics/GraphicsLayerDebugInfo.h" |
+#include "platform/graphics/GraphicsScreen.h" |
#include "platform/graphics/paint/CullRect.h" |
#include "platform/graphics/paint/PaintController.h" |
#include "platform/scheduler/CancellableTaskFactory.h" |
@@ -2365,11 +2366,16 @@ void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases) |
// Updating layout can run script, which can tear down the FrameView. |
RefPtrWillBeRawPtr<FrameView> protector(this); |
+ uintptr_t previousId = setCurrentScreenId(Page::screenId(page())); |
+ fflush(stderr); |
+ |
updateStyleAndLayoutIfNeededRecursive(); |
ASSERT(lifecycle().state() >= DocumentLifecycle::LayoutClean); |
if (phases == OnlyUpToLayoutClean) { |
updateViewportIntersectionsForSubtree(); |
+ setCurrentScreenId(previousId); |
+ fflush(stderr); |
return; |
} |
@@ -2414,6 +2420,8 @@ void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases) |
} |
updateViewportIntersectionsForSubtree(); |
+ setCurrentScreenId(previousId); |
+ fflush(stderr); |
} |
void FrameView::updatePaintProperties() |