Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

third_party/WebKit/Source/core/paint/PaintInvalidator.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/PaintInvalidator.h"
 
 #include "core/editing/FrameSelection.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
@@ skipping 56 matching lines @@
       // TODO(wangxianzhu): Avoid containingBlock().
       object.containingBlock()->flipForWritingMode(rect);
     }
   }
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     // In SPv2, visual rects are in the space of their local transform node.
     // For SVG, the input rect is in local SVG coordinates in which paint
     // offset doesn't apply.
     if (!object.isSVGChild())
-      rect.moveBy(FloatPoint(context.treeBuilderContext.current.paintOffset));
+      rect.moveBy(FloatPoint(object.paintOffset()));

[Xianzhu, 2017/01/06 17:24:39]

This is just changed to a shorter form. They are actually equivalent (DCHECKed
at the beginning of invalidatePaintIfNeeded).

     // Use enclosingIntRect to ensure the final visual rect will cover the
     // rect in source coordinates no matter if the painting will use pixel
     // snapping.
     return LayoutRect(enclosingIntRect(rect));
   }
 
   LayoutRect result;
   if (context.forcedSubtreeInvalidationFlags &
       PaintInvalidatorContext::ForcedSubtreeSlowPathRect) {
     result = slowMapToVisualRectInAncestorSpace(
         object, *context.paintInvalidationContainer, rect);
   } else if (object == context.paintInvalidationContainer) {
     result = LayoutRect(rect);
   } else {
     // For non-root SVG, the input rect is in local SVG coordinates in which
     // paint offset doesn't apply.
     if (!object.isSVGChild()) {
-      rect.moveBy(FloatPoint(context.treeBuilderContext.current.paintOffset));
+      rect.moveBy(FloatPoint(object.paintOffset()));
       // Use enclosingIntRect to ensure the final visual rect will cover the
       // rect in source coordinates no matter if the painting will use pixel
       // snapping.
       rect = enclosingIntRect(rect);
     }
 
     PropertyTreeState currentTreeState(
         context.treeBuilderContext.current.transform,
         context.treeBuilderContext.current.clip,
         context.treeBuilderContext.currentEffect,
         context.treeBuilderContext.current.scroll);
     const auto* containerPaintProperties =
         context.paintInvalidationContainer->paintProperties();
     auto containerContentsProperties =
         containerPaintProperties->contentsProperties();
 
     bool success = false;
     result = LayoutRect(geometryMapper.mapToVisualRectInDestinationSpace(
-        rect, currentTreeState, containerContentsProperties.propertyTreeState,
-        success));
+        rect, currentTreeState, containerContentsProperties, success));
     DCHECK(success);
 
     // Convert the result to the container's contents space.
-    result.moveBy(-containerContentsProperties.paintOffset);
+    result.moveBy(-context.paintInvalidationContainer->paintOffset());
   }
 
   object.adjustVisualRectForRasterEffects(result);
 
   PaintLayer::mapRectInPaintInvalidationContainerToBacking(
       *context.paintInvalidationContainer, result);
 
   return result;
 }
 
@@ skipping 28 matching lines @@
 LayoutPoint PaintInvalidator::computeLocationInBacking(
     const LayoutObject& object,
     const PaintInvalidatorContext& context) {
   // Use visual rect location for LayoutTexts because it suffices to check
   // visual rect change for layout caused invalidation.
   if (object.isText())
     return context.newVisualRect.location();
 
   FloatPoint point;
   if (object != context.paintInvalidationContainer) {
-    point.moveBy(FloatPoint(context.treeBuilderContext.current.paintOffset));
+    point.moveBy(FloatPoint(object.paintOffset()));
 
     PropertyTreeState currentTreeState(
         context.treeBuilderContext.current.transform,
         context.treeBuilderContext.current.clip,
         context.treeBuilderContext.currentEffect,
         context.treeBuilderContext.current.scroll);
     const auto* containerPaintProperties =
         context.paintInvalidationContainer->paintProperties();
     auto containerContentsProperties =
         containerPaintProperties->contentsProperties();
 
     bool success = false;
     point = m_geometryMapper
-                .mapRectToDestinationSpace(
-                    FloatRect(point, FloatSize()), currentTreeState,
-                    containerContentsProperties.propertyTreeState, success)
+                .mapRectToDestinationSpace(FloatRect(point, FloatSize()),
+                                           currentTreeState,
+                                           containerContentsProperties, success)
                 .location();
     DCHECK(success);
 
     // Convert the result to the container's contents space.
-    point.moveBy(-containerContentsProperties.paintOffset);
+    point.moveBy(-context.paintInvalidationContainer->paintOffset());
   }
 
   PaintLayer::mapPointInPaintInvalidationContainerToBacking(
       *context.paintInvalidationContainer, point);
 
   return LayoutPoint(point);
 }
 
 void PaintInvalidator::updatePaintingLayer(const LayoutObject& object,
                                            PaintInvalidatorContext& context) {
@@ skipping 132 matching lines @@
       object.isColumnSpanAll()) {
     context.forcedSubtreeInvalidationFlags |=
         PaintInvalidatorContext::ForcedSubtreeSlowPathRect;
   }
 
   ObjectPaintInvalidator objectPaintInvalidator(object);
   context.oldVisualRect = object.previousVisualRect();
   context.oldLocation = objectPaintInvalidator.previousLocationInBacking();
   context.newVisualRect = computeVisualRectInBacking(object, context);
   context.newLocation = computeLocationInBacking(object, context);
-  context.oldPaintOffset = object.previousPaintOffset();
-  context.newPaintOffset = context.treeBuilderContext.current.paintOffset;
 
   IntSize adjustment = object.scrollAdjustmentForPaintInvalidation(
       *context.paintInvalidationContainer);
   context.newLocation.move(adjustment);
   context.newVisualRect.move(adjustment);
 
   object.getMutableForPainting().setPreviousVisualRect(context.newVisualRect);
   objectPaintInvalidator.setPreviousLocationInBacking(context.newLocation);
-  object.getMutableForPainting().setPreviousPaintOffset(context.newPaintOffset);
 }
 
 void PaintInvalidator::invalidatePaintIfNeeded(
     FrameView& frameView,
     PaintInvalidatorContext& context) {
   LayoutView* layoutView = frameView.layoutView();
   CHECK(layoutView);
 
   context.paintInvalidationContainer =
       context.paintInvalidationContainerForStackedContents =
           &layoutView->containerForPaintInvalidation();
   context.paintingLayer = layoutView->layer();
 
   if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     ScopedUndoFrameViewContentClipAndScroll undo(frameView, context);
     frameView.invalidatePaintOfScrollControlsIfNeeded(context);
   }
 
   if (frameView.frame().selection().isCaretBoundsDirty())
     frameView.frame().selection().invalidateCaretRect();
 }
 
 void PaintInvalidator::invalidatePaintIfNeeded(
     const LayoutObject& object,
+    const LayoutPoint& oldPaintOffset,
     PaintInvalidatorContext& context) {
   object.getMutableForPainting().ensureIsReadyForPaintInvalidation();
 
+  DCHECK(context.treeBuilderContext.current.paintOffset ==
+         object.paintOffset());
+  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
+      object.paintOffset() != oldPaintOffset) {
+    object.getMutableForPainting().setShouldDoFullPaintInvalidation(
+        PaintInvalidationLocationChange);
+  }
+
   if (!context.forcedSubtreeInvalidationFlags &&
       !object
            .shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState())
     return;
 
   updatePaintingLayer(object, context);
 
   if (object.document().printing())
     return;  // Don't invalidate paints if we're printing.
 
@@ skipping 24 matching lines @@
                ForcedSubtreeFullInvalidationForStackedContents);
       break;
     case PaintInvalidationSVGResourceChange:
       context.forcedSubtreeInvalidationFlags |=
           PaintInvalidatorContext::ForcedSubtreeSVGResourceChange;
       break;
     default:
       break;
   }
 
-  if (context.oldLocation != context.newLocation ||
-      (RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
-       context.oldPaintOffset != context.newPaintOffset)) {
+  if (context.oldLocation != context.newLocation) {
     context.forcedSubtreeInvalidationFlags |=
         PaintInvalidatorContext::ForcedSubtreeInvalidationChecking;
   }
 
   // TODO(crbug.com/490725): This is a workaround for the bug, to force
   // descendant to update visual rects on clipping change.
   if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
       context.oldVisualRect != context.newVisualRect
       // Note that isLayoutView() below becomes unnecessary after the launch of
       // root layer scrolling.
       && (object.hasOverflowClip() || object.isLayoutView()) &&
       !toLayoutBox(object).usesCompositedScrolling())
     context.forcedSubtreeInvalidationFlags |=
         PaintInvalidatorContext::ForcedSubtreeInvalidationRectUpdate;
 }
 
 void PaintInvalidator::processPendingDelayedPaintInvalidations() {
   for (auto target : m_pendingDelayedPaintInvalidations)
     target->getMutableForPainting().setShouldDoFullPaintInvalidation(
         PaintInvalidationDelayedFull);
 }
 
 }  // namespace blink