| Index: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
|
| index e7ca1485c27c4b6ba68135c76d94b28e905c38d0..a0f657d6f3cdbf66081228badc8abb090ee24ec7 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
|
| @@ -196,6 +196,12 @@ void updateDescendantDependentFlagsForEntireSubtree(PaintLayer& layer)
|
|
|
| void PaintLayerCompositor::updateIfNeededRecursive()
|
| {
|
| + SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Compositing.UpdateTime");
|
| + updateIfNeededRecursiveInternal();
|
| +}
|
| +
|
| +void PaintLayerCompositor::updateIfNeededRecursiveInternal()
|
| +{
|
| FrameView* view = m_layoutView.frameView();
|
| if (view->shouldThrottleRendering())
|
| return;
|
| @@ -208,7 +214,7 @@ void PaintLayerCompositor::updateIfNeededRecursive()
|
| // the frame tree is in an inconsistent state, such as in the middle of frame detach.
|
| // TODO(bbudge) Remove this check when trusted Pepper plugins are gone.
|
| if (localFrame->document()->isActive() && localFrame->contentLayoutObject())
|
| - localFrame->contentLayoutObject()->compositor()->updateIfNeededRecursive();
|
| + localFrame->contentLayoutObject()->compositor()->updateIfNeededRecursiveInternal();
|
| }
|
|
|
| TRACE_EVENT0("blink", "PaintLayerCompositor::updateIfNeededRecursive");
|
|
|