Chromium Code Reviews| 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 a05b332a0d84556a70e06fd18f74a946b61c7ab5..b366319666d46dfefca755dc884eb5664678aaeb 100644 |
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
| @@ -107,6 +107,8 @@ |
| #include "platform/text/TextStream.h" |
| #include "public/platform/WebDisplayItemList.h" |
| #include "public/platform/WebFrameScheduler.h" |
| +#include "public/web/WebLocalFrame.h" |
| +#include "web/WebLocalFrameImpl.h" |
| #include "wtf/CurrentTime.h" |
| #include "wtf/StdLibExtras.h" |
| #include "wtf/TemporaryChange.h" |
| @@ -962,6 +964,8 @@ void FrameView::layout() |
| return; |
| } |
| + WebLocalFrame* wlframe = WebLocalFrameImpl::fromFrame(frame()); |
| + |
| FontCachePurgePreventer fontCachePurgePreventer; |
| { |
| TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false); |
| @@ -1032,7 +1036,8 @@ void FrameView::layout() |
| } |
| TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink.debug.layout"), "LayoutTree", |
|
benjhayden
2016/06/03 18:12:28
comment out for puf
|
| - this, TracedLayoutObject::create(*layoutView(), false)); |
| + TRACE_ID_WITH_SCOPE("LayoutTree", wlframe), |
| + TracedLayoutObject::create(*layoutView(), false)); |
| performLayout(inSubtreeLayout); |
| @@ -1048,7 +1053,8 @@ void FrameView::layout() |
| layoutView()->enclosingLayer()->updateLayerPositionsAfterLayout(); |
| TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink.debug.layout"), "LayoutTree", |
| - this, TracedLayoutObject::create(*layoutView(), true)); |
| + TRACE_ID_WITH_SCOPE("LayoutTree", wlframe), |
| + TracedLayoutObject::create(*layoutView(), true)); |
| layoutViewItem().compositor()->didLayout(); |