Change slimmingPaintV2Enabled to slimmingPaintInvalidationEnabled where needed

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 1450 matching lines @@
 
 void FrameView::addBackgroundAttachmentFixedObject(LayoutObject* object) {
   ASSERT(!m_backgroundAttachmentFixedObjects.contains(object));
 
   m_backgroundAttachmentFixedObjects.add(object);
   if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
     scrollingCoordinator->frameViewHasBackgroundAttachmentFixedObjectsDidChange(
         this);
 
   // Ensure main thread scrolling reasons are recomputed.
-  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+  if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
     setNeedsPaintPropertyUpdate();
     // The object's scroll properties are not affected by its own background.
     object->setAncestorsNeedPaintPropertyUpdateForMainThreadScrolling();
   }
 }
 
 void FrameView::removeBackgroundAttachmentFixedObject(LayoutObject* object) {
   ASSERT(m_backgroundAttachmentFixedObjects.contains(object));
 
   m_backgroundAttachmentFixedObjects.remove(object);
   if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
     scrollingCoordinator->frameViewHasBackgroundAttachmentFixedObjectsDidChange(
         this);
 
   // Ensure main thread scrolling reasons are recomputed.
-  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+  if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
     setNeedsPaintPropertyUpdate();
     // The object's scroll properties are not affected by its own background.
     object->setAncestorsNeedPaintPropertyUpdateForMainThreadScrolling();
   }
 }
 
 void FrameView::addViewportConstrainedObject(LayoutObject* object) {
   if (!m_viewportConstrainedObjects)
     m_viewportConstrainedObjects = wrapUnique(new ViewportConstrainedObjectSet);
 
@@ skipping 1219 matching lines @@
   updateWidgetGeometries();
 }
 
 void FrameView::updateAllLifecyclePhases() {
   frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(
       DocumentLifecycle::PaintClean);
 }
 
 // TODO(chrishtr): add a scrolling update lifecycle phase.
 void FrameView::updateLifecycleToCompositingCleanPlusScrolling() {
-  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     updateAllLifecyclePhasesExceptPaint();
-  else
+  } else {
     frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(
         DocumentLifecycle::CompositingClean);
+  }
 }
 
 void FrameView::updateAllLifecyclePhasesExceptPaint() {
   frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(
       DocumentLifecycle::PrePaintClean);
 }
 
 void FrameView::updateLifecycleToLayoutClean() {
   frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(
       DocumentLifecycle::LayoutClean);
@@ skipping 262 matching lines @@
       synchronizedPaintRecursively(contentsClippingMaskLayer);
   }
 
   for (auto& child : graphicsLayer->children())
     synchronizedPaintRecursively(child);
 }
 
 void FrameView::pushPaintArtifactToCompositor() {
   TRACE_EVENT0("blink", "FrameView::pushPaintArtifactToCompositor");
 
-  ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+  DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
   Page* page = frame().page();
   if (!page)
     return;
 
   if (!m_paintArtifactCompositor) {
     m_paintArtifactCompositor = PaintArtifactCompositor::create();
     page->chromeClient().attachRootLayer(
         m_paintArtifactCompositor->getWebLayer(), &frame());
   }
@@ skipping 90 matching lines @@
       frame().loader().stateMachine()->committedFirstRealDocumentLoad())
     m_isVisuallyNonEmpty = true;
 }
 
 void FrameView::invalidateTreeIfNeededRecursive() {
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.PaintInvalidation.UpdateTime");
   invalidateTreeIfNeededRecursiveInternal();
 }
 
 void FrameView::invalidateTreeIfNeededRecursiveInternal() {
-  DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+  DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
   CHECK(layoutView());
 
   // We need to stop recursing here since a child frame view might not be
   // throttled even though we are (e.g., it didn't compute its visibility yet).
   if (shouldThrottleRendering())
     return;
   TRACE_EVENT1("blink", "FrameView::invalidateTreeIfNeededRecursive", "root",
                layoutView()->debugName().ascii());
 
   Vector<const LayoutObject*> pendingDelayedPaintInvalidations;
@@ skipping 425 matching lines @@
     return;
   page->chromeClient().setCursor(cursor, m_frame);
 }
 
 void FrameView::frameRectsChanged() {
   TRACE_EVENT0("blink", "FrameView::frameRectsChanged");
   if (layoutSizeFixedToFrameSize())
     setLayoutSizeInternal(frameRect().size());
 
   setNeedsUpdateViewportIntersection();
-  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+  if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
     // The overflow clip property depends on the frame rect.
     setNeedsPaintPropertyUpdate();
   }
 
   for (const auto& child : m_children)
     child->frameRectsChanged();
 }
 
 void FrameView::setLayoutSizeInternal(const IntSize& size) {
   if (m_layoutSize == size)
@@ skipping 1069 matching lines @@
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.width();
 }
 
 int FrameView::initialViewportHeight() const {
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.height();
 }
 
 }  // namespace blink