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 d6cf5262ca000d515f6127e503003f14f40d8aa9..bfa6c56cccd4198652dd87fc07f084a60b9bdf1e 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -92,6 +92,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" |
@@ -2368,11 +2369,16 @@ void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases) |
// Updating layout can run script, which can tear down the FrameView. |
RefPtrWillBeRawPtr<FrameView> protector(this); |
+ int64_t previousId = setCurrentScreenId(reinterpret_cast<int64_t>(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() |