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 4db3dbc0e72a736bd2801a6ff50952ee4e866bc1..864a48ab8f89a7f26355693749fd482c95961591 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -2449,9 +2449,6 @@ void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases) |
if (!m_frame->document()->printing()) |
synchronizedPaint(); |
- if (RuntimeEnabledFeatures::frameTimingSupportEnabled()) |
- updateFrameTimingRequestsIfNeeded(); |
- |
if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
pushPaintArtifactToCompositor(); |
@@ -2552,18 +2549,6 @@ void FrameView::pushPaintArtifactToCompositor() |
page->chromeClient().didPaint(paintArtifact); |
} |
-void FrameView::updateFrameTimingRequestsIfNeeded() |
-{ |
- GraphicsLayerFrameTimingRequests graphicsLayerTimingRequests; |
- // TODO(mpb) use a 'dirty' bit to not call this every time. |
- collectFrameTimingRequestsRecursive(graphicsLayerTimingRequests); |
- |
- for (const auto& iter : graphicsLayerTimingRequests) { |
- const GraphicsLayer* graphicsLayer = iter.key; |
- graphicsLayer->platformLayer()->setFrameTimingRequests(iter.value); |
- } |
-} |
- |
void FrameView::updateStyleAndLayoutIfNeededRecursive() |
{ |
SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.StyleAndLayout.UpdateTime"); |
@@ -3948,43 +3933,6 @@ void FrameView::collectAnnotatedRegions(LayoutObject& layoutObject, Vector<Annot |
collectAnnotatedRegions(*curr, regions); |
} |
-void FrameView::collectFrameTimingRequestsRecursive(GraphicsLayerFrameTimingRequests& graphicsLayerTimingRequests) |
-{ |
- if (!m_frameTimingRequestsDirty) |
- return; |
- |
- collectFrameTimingRequests(graphicsLayerTimingRequests); |
- |
- for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling()) { |
- if (!child->isLocalFrame()) |
- continue; |
- |
- toLocalFrame(child)->view()->collectFrameTimingRequestsRecursive(graphicsLayerTimingRequests); |
- } |
- m_frameTimingRequestsDirty = false; |
-} |
- |
-void FrameView::collectFrameTimingRequests(GraphicsLayerFrameTimingRequests& graphicsLayerTimingRequests) |
-{ |
- if (!m_frame->isLocalFrame()) |
- return; |
- Frame* frame = m_frame.get(); |
- LocalFrame* localFrame = toLocalFrame(frame); |
- LayoutRect viewRect = localFrame->contentLayoutItem().viewRect(); |
- const LayoutBoxModelObject& paintInvalidationContainer = localFrame->contentLayoutObject()->containerForPaintInvalidation(); |
- // If the frame is being throttled, its compositing state may not be up to date. |
- if (!paintInvalidationContainer.enclosingLayer()->isAllowedToQueryCompositingState()) |
- return; |
- const GraphicsLayer* graphicsLayer = paintInvalidationContainer.enclosingLayer()->graphicsLayerBacking(); |
- |
- if (!graphicsLayer) |
- return; |
- |
- PaintLayer::mapRectToPaintInvalidationBacking(*localFrame->contentLayoutObject(), paintInvalidationContainer, viewRect); |
- |
- graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, WebRect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosingIntRect(viewRect))); |
-} |
- |
void FrameView::setNeedsUpdateViewportIntersection() |
{ |
m_needsUpdateViewportIntersection = true; |