Notify paint for each frame

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

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 cd578f3903f9ac16aa8302409e85ce03aed6351b..fe08547307e0d194f818ff85bee2699327081400 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -3242,14 +3242,6 @@ void FrameView::PrePaint() {
   });
 }
 
-void FrameView::NotifyPaint(const PaintController& paint_controller) const {
-  DCHECK(frame_->GetDocument());
-  PaintTiming::From(*frame_->GetDocument())
-      .NotifyPaint(paint_controller.FirstPainted(),
-                   paint_controller.TextPainted(),
-                   paint_controller.ImagePainted());
-}
-
 void FrameView::PaintTree() {
   TRACE_EVENT0("blink", "FrameView::paintTree");
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Paint.UpdateTime");
@@ -3270,7 +3262,7 @@ void FrameView::PaintTree() {
         graphics_context.SetPrinting(true);
       Paint(graphics_context, CullRect(LayoutRect::InfiniteIntRect()));
       paint_controller_->CommitNewDisplayItems(LayoutSize());
-      NotifyPaint(*paint_controller_);
+      FramePainter(graphics_context, *this).NotifyPaint();

[zhenw, 2017/05/08 22:07:54]

Paint() on line 3263 will eventually call NotifyPaint(). But
CommitNewDispalyItems() on line 3264 will update first paint. So I do another
explicit NotifyPaint() here.

This seems like a hack. Any suggestion on a better way?

[Xianzhu, 2017/05/08 22:44:46]

This is not needed as long as we call NotifyPaint() just after calling
PaintController::EndFrame().

[Zhen Wang, 2017/05/09 20:13:43]

Removed

     }
   } else {
     // A null graphics layer can occur for painting of SVG images that are not
@@ -3312,7 +3304,6 @@ void FrameView::PaintGraphicsLayerRecursively(GraphicsLayer* graphics_layer) {
   DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
   if (graphics_layer->DrawsContent()) {
     graphics_layer->Paint(nullptr);
-    NotifyPaint(graphics_layer->GetPaintController());
   }
 
   if (GraphicsLayer* mask_layer = graphics_layer->MaskLayer())
@@ -4696,13 +4687,13 @@ void FrameView::Paint(GraphicsContext& context,
 void FrameView::Paint(GraphicsContext& context,
                       const GlobalPaintFlags global_paint_flags,
                       const CullRect& cull_rect) const {
-  FramePainter(*this).Paint(context, global_paint_flags, cull_rect);
+  FramePainter(context, *this).Paint(global_paint_flags, cull_rect);
 }
 
 void FrameView::PaintContents(GraphicsContext& context,
                               const GlobalPaintFlags global_paint_flags,
                               const IntRect& damage_rect) const {
-  FramePainter(*this).PaintContents(context, global_paint_flags, damage_rect);
+  FramePainter(context, *this).PaintContents(global_paint_flags, damage_rect);
 }
 
 bool FrameView::IsPointInScrollbarCorner(const IntPoint& point_in_root_frame) {