Rename paint related lifecycle methods of FrameView

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 2923 matching lines @@
 
         if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
           if (view.compositor()->inCompositingMode())
             scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
         }
 
         updateCompositedSelectionIfNeeded();
       }
     }
 
-    if (targetState >= DocumentLifecycle::PrePaintClean) {
-      updatePaintProperties();
-    }
+    if (targetState >= DocumentLifecycle::PrePaintClean)
+      prePaint();
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
       DocumentAnimations::updateAnimations(layoutView()->document());
 
     if (targetState == DocumentLifecycle::PaintClean) {
       if (!m_frame->document()->printing())
-        synchronizedPaint();
+        paintTree();
 
       if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         pushPaintArtifactToCompositor();
 
       DCHECK(!view.hasPendingSelection());
       DCHECK((m_frame->document()->printing() &&
               lifecycle().state() == DocumentLifecycle::PrePaintClean) ||
              lifecycle().state() == DocumentLifecycle::PaintClean);
     }
 
@@ skipping 14 matching lines @@
 void FrameView::performScrollAnchoringAdjustments() {
   for (WeakMember<ScrollableArea>& scroller : m_anchoringAdjustmentQueue) {
     if (scroller) {
       DCHECK(scroller->scrollAnchor());
       scroller->scrollAnchor()->adjust();
     }
   }
   m_anchoringAdjustmentQueue.clear();
 }
 
-void FrameView::updatePaintProperties() {
-  TRACE_EVENT0("blink", "FrameView::updatePaintProperties");
+void FrameView::prePaint() {
+  TRACE_EVENT0("blink", "FrameView::prePaint");
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.PrePaint.UpdateTime");
 
   if (!m_paintController)
     m_paintController = PaintController::create();
 
   forAllNonThrottledFrameViews([](FrameView& frameView) {
     frameView.lifecycle().advanceTo(DocumentLifecycle::InPrePaint);
   });
 
   if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
     PrePaintTreeWalk().walk(*this);
 
   forAllNonThrottledFrameViews([](FrameView& frameView) {
     frameView.lifecycle().advanceTo(DocumentLifecycle::PrePaintClean);
   });
 }
 
-void FrameView::synchronizedPaint() {
-  TRACE_EVENT0("blink", "FrameView::synchronizedPaint");
+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());
     }
   } 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 synchronized painting of the
-    // host page.
+    // the host page and will be painted during painting of the host page.
     if (GraphicsLayer* rootGraphicsLayer =
             view.compositor()->rootGraphicsLayer()) {
-      synchronizedPaintRecursively(rootGraphicsLayer);
+      paintGraphicsLayerRecursively(rootGraphicsLayer);
     }
 
     // TODO(sataya.m):Main frame doesn't create RootFrameViewport in some
     // webkit_unit_tests (http://crbug.com/644788).
     if (m_viewportScrollableArea) {
       if (GraphicsLayer* layerForHorizontalScrollbar =
               m_viewportScrollableArea->layerForHorizontalScrollbar()) {
-        synchronizedPaintRecursively(layerForHorizontalScrollbar);
+        paintGraphicsLayerRecursively(layerForHorizontalScrollbar);
       }
       if (GraphicsLayer* layerForVerticalScrollbar =
               m_viewportScrollableArea->layerForVerticalScrollbar()) {
-        synchronizedPaintRecursively(layerForVerticalScrollbar);
+        paintGraphicsLayerRecursively(layerForVerticalScrollbar);
       }
       if (GraphicsLayer* layerForScrollCorner =
               m_viewportScrollableArea->layerForScrollCorner()) {
-        synchronizedPaintRecursively(layerForScrollCorner);
+        paintGraphicsLayerRecursively(layerForScrollCorner);
       }
     }
   }
 
   forAllNonThrottledFrameViews([](FrameView& frameView) {
     frameView.lifecycle().advanceTo(DocumentLifecycle::PaintClean);
     LayoutViewItem layoutViewItem = frameView.layoutViewItem();
     if (!layoutViewItem.isNull())
       layoutViewItem.layer()->clearNeedsRepaintRecursively();
   });
 }
 
-void FrameView::synchronizedPaintRecursively(GraphicsLayer* graphicsLayer) {
+void FrameView::paintGraphicsLayerRecursively(GraphicsLayer* graphicsLayer) {
   if (graphicsLayer->drawsContent())
     graphicsLayer->paint(nullptr);
 
   if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     if (GraphicsLayer* maskLayer = graphicsLayer->maskLayer())
-      synchronizedPaintRecursively(maskLayer);
+      paintGraphicsLayerRecursively(maskLayer);
     if (GraphicsLayer* contentsClippingMaskLayer =
             graphicsLayer->contentsClippingMaskLayer())
-      synchronizedPaintRecursively(contentsClippingMaskLayer);
+      paintGraphicsLayerRecursively(contentsClippingMaskLayer);
   }
 
   for (auto& child : graphicsLayer->children())
-    synchronizedPaintRecursively(child);
+    paintGraphicsLayerRecursively(child);
 }
 
 void FrameView::pushPaintArtifactToCompositor() {
   TRACE_EVENT0("blink", "FrameView::pushPaintArtifactToCompositor");
 
   DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
   Page* page = frame().page();
   if (!page)
     return;
@@ skipping 1830 matching lines @@
        reason < MainThreadScrollingReason::kMainThreadScrollingReasonCount;
        ++reason) {
     if (m_mainThreadScrollingReasonsCounter[reason] > 0) {
       reasons |= 1 << (reason - 1);
     }
   }
   return reasons;
 }
 
 }  // namespace blink