| 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 ae3818d3c8d36c02f6bc7066a16ebf685155cf5d..a186f32f862648af839516f6f48f234734392c43 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -3244,14 +3244,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");
|
| @@ -3272,7 +3264,6 @@ void FrameView::PaintTree() {
|
| graphics_context.SetPrinting(true);
|
| Paint(graphics_context, CullRect(LayoutRect::InfiniteIntRect()));
|
| paint_controller_->CommitNewDisplayItems(LayoutSize());
|
| - NotifyPaint(*paint_controller_);
|
| }
|
| } else {
|
| // A null graphics layer can occur for painting of SVG images that are not
|
| @@ -3314,7 +3305,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())
|
| @@ -4698,13 +4688,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) {
|
|
|