Fix first paint tracking for SPv2

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 76 matching lines @@
 #include "core/page/AutoscrollController.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/RootScrollerUtil.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "core/paint/FramePainter.h"
 #include "core/paint/PaintLayer.h"
+#include "core/paint/PaintTiming.h"
 #include "core/paint/PrePaintTreeWalk.h"
 #include "core/plugins/PluginView.h"
 #include "core/style/ComputedStyle.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGSVGElement.h"
 #include "platform/Histogram.h"
 #include "platform/HostWindow.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/WebFrameScheduler.h"
@@ skipping 2888 matching lines @@
   });
 
   if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
     PrePaintTreeWalk().walk(*this);
 
   forAllNonThrottledFrameViews([](FrameView& frameView) {
     frameView.lifecycle().advanceTo(DocumentLifecycle::PrePaintClean);
   });
 }
 
+void FrameView::notifyPaint(const PaintController& paintController) const {
+  if (Document* document = m_frame->document()) {
+    PaintTiming::from(*document).notifyPaint(paintController.firstPainted(),
+                                             paintController.textPainted(),
+                                             paintController.imagePainted());
+  }
+}
+
 void FrameView::paintTree() {
   TRACE_EVENT0("blink", "FrameView::paintTree");
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Paint.UpdateTime");
 
   ASSERT(frame() == page()->mainFrame() ||
          (!frame().tree().parent()->isLocalFrame()));
 
   LayoutViewItem view = layoutViewItem();
   ASSERT(!view.isNull());
   forAllNonThrottledFrameViews([](FrameView& frameView) {
     frameView.lifecycle().advanceTo(DocumentLifecycle::InPaint);
   });
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     if (layoutView()->layer()->needsRepaint()) {
       GraphicsContext graphicsContext(*m_paintController);
       paint(graphicsContext, CullRect(LayoutRect::infiniteIntRect()));
       m_paintController->commitNewDisplayItems(LayoutSize());
+      notifyPaint(*m_paintController);
     }
   } else {
     // A null graphics layer can occur for painting of SVG images that are not
     // parented into the main frame tree, or when the FrameView is the main
     // frame view of a page overlay. The page overlay is in the layer tree of
     // the host page and will be painted during painting of the host page.
     if (GraphicsLayer* rootGraphicsLayer =
             view.compositor()->rootGraphicsLayer()) {
       paintGraphicsLayerRecursively(rootGraphicsLayer);
     }
@@ skipping 18 matching lines @@
 
   forAllNonThrottledFrameViews([](FrameView& frameView) {
     frameView.lifecycle().advanceTo(DocumentLifecycle::PaintClean);
     LayoutViewItem layoutViewItem = frameView.layoutViewItem();
     if (!layoutViewItem.isNull())
       layoutViewItem.layer()->clearNeedsRepaintRecursively();
   });
 }
 
 void FrameView::paintGraphicsLayerRecursively(GraphicsLayer* graphicsLayer) {
-  if (graphicsLayer->drawsContent())
+  if (graphicsLayer->drawsContent()) {
     graphicsLayer->paint(nullptr);
+    notifyPaint(graphicsLayer->getPaintController());
+  }
 
   if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     if (GraphicsLayer* maskLayer = graphicsLayer->maskLayer())
       paintGraphicsLayerRecursively(maskLayer);
     if (GraphicsLayer* contentsClippingMaskLayer =
             graphicsLayer->contentsClippingMaskLayer())
       paintGraphicsLayerRecursively(contentsClippingMaskLayer);
   }
 
   for (auto& child : graphicsLayer->children())
@@ skipping 1829 matching lines @@
        reason < MainThreadScrollingReason::kMainThreadScrollingReasonCount;
        ++reason) {
     if (m_mainThreadScrollingReasonsCounter[reason] > 0) {
       reasons |= 1 << reason;
     }
   }
   return reasons;
 }
 
 }  // namespace blink