Remove PaintInvalidatorContext::newVisualRect

third_party/WebKit/Source/core/paint/BoxPaintInvalidator.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/BoxPaintInvalidator.h"
 
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/paint/ObjectPaintInvalidator.h"
@@ skipping 87 matching lines @@
   const ComputedStyle& style = m_box.styleRef();
 
   if ((style.backgroundLayers().thisOrNextLayersUseContentBox() ||
        style.maskLayers().thisOrNextLayersUseContentBox()) &&
       m_box.previousContentBoxSize() != m_box.contentBoxRect().size())
     return PaintInvalidationContentBoxChange;
 
   LayoutSize oldBorderBoxSize = m_box.previousSize();
   LayoutSize newBorderBoxSize = m_box.size();
   bool borderBoxChanged = oldBorderBoxSize != newBorderBoxSize;
-  if (!borderBoxChanged && m_context.oldVisualRect == m_context.newVisualRect)
+  if (!borderBoxChanged && m_context.oldVisualRect == m_box.visualRect())
     return PaintInvalidationNone;
 
   // If either border box changed or bounds changed, and old or new border box
   // doesn't equal old or new bounds, incremental invalidation is not
   // applicable. This captures the following cases:
   // - pixel snapping of paint invalidation bounds,
   // - scale, rotate, skew etc. transforms,
   // - visual overflows.
   if (m_context.oldVisualRect !=
           LayoutRect(m_context.oldLocation, oldBorderBoxSize) ||
-      m_context.newVisualRect !=
+      m_box.visualRect() !=
           LayoutRect(m_context.newLocation, newBorderBoxSize)) {
     return borderBoxChanged ? PaintInvalidationBorderBoxChange
                             : PaintInvalidationBoundsChange;
   }
 
   DCHECK(borderBoxChanged);
 
   if (style.hasVisualOverflowingEffect() || style.hasAppearance() ||
       style.hasFilterInducingProperty() || style.resize() != RESIZE_NONE ||
       style.hasMask())
@@ skipping 117 matching lines @@
 
 PaintInvalidationReason BoxPaintInvalidator::invalidatePaintIfNeeded() {
   invalidateScrollingContentsBackgroundIfNeeded();
 
   PaintInvalidationReason reason = computePaintInvalidationReason();
   if (reason == PaintInvalidationIncremental) {
     bool invalidated;
     if (m_box.isLayoutView() &&
         !RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
       invalidated = incrementallyInvalidatePaint(
-          reason, m_context.oldVisualRect, m_context.newVisualRect);
+          reason, m_context.oldVisualRect, m_box.visualRect());
     } else {
       invalidated = incrementallyInvalidatePaint(
           reason, LayoutRect(m_context.oldLocation, m_box.previousSize()),
           LayoutRect(m_context.newLocation, m_box.size()));
     }
     if (invalidated) {
       m_context.paintingLayer->setNeedsRepaint();
       m_box.invalidateDisplayItemClients(reason);
     } else {
       reason = PaintInvalidationNone;
@@ skipping 17 matching lines @@
   // This is for the next invalidatePaintIfNeeded so must be at the end.
   savePreviousBoxGeometriesIfNeeded();
 
   return reason;
 }
 
 bool BoxPaintInvalidator::
     needsToSavePreviousContentBoxSizeOrLayoutOverflowRect() {
   // Don't save old box geometries if the paint rect is empty because we'll
   // fully invalidate once the paint rect becomes non-empty.
-  if (m_context.newVisualRect.isEmpty())
+  if (m_box.visualRect().isEmpty())
     return false;
 
   if (m_box.paintedOutputOfObjectHasNoEffectRegardlessOfSize())
     return false;
 
   const ComputedStyle& style = m_box.styleRef();
 
   // Background and mask layers can depend on other boxes than border box. See
   // crbug.com/490533
   if ((style.backgroundLayers().thisOrNextLayersUseContentBox() ||
@@ skipping 14 matching lines @@
   if (needsToSavePreviousContentBoxSizeOrLayoutOverflowRect()) {
     m_box.getMutableForPainting()
         .savePreviousContentBoxSizeAndLayoutOverflowRect();
   } else {
     m_box.getMutableForPainting()
         .clearPreviousContentBoxSizeAndLayoutOverflowRect();
   }
 }
 
 }  // namespace blink