Let synchronized painting generate correct paint invalidation rects

third_party/WebKit/Source/core/layout/LayoutObject.h

Index: third_party/WebKit/Source/core/layout/LayoutObject.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.h b/third_party/WebKit/Source/core/layout/LayoutObject.h
index b05e5a6c709c96c38e40bf50cc26d365df6c44cc..0ff5a3d8d910fd7b62218713ff1a0b3f7285e65b 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.h
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.h
@@ -1020,7 +1020,7 @@ public:
 
     // Invalidate the paint of a specific subrectangle within a given object. The rect |r| is in the object's coordinate space.
     void invalidatePaintRectangle(const LayoutRect&) const;
-    void invalidatePaintRectangleNotInvalidatingDisplayItemClients(const LayoutRect&) const;
+    void invalidatePaintRectangleNotInvalidatingDisplayItemClients(const LayoutRect& r) const { invalidatePaintRectangleInternal(r); }

[chrishtr, 2015/10/23 17:15:07]

Don't inline this.

[Xianzhu, 2015/10/23 18:43:27]

Done.

 
     // Walk the tree after layout issuing paint invalidations for layoutObjects that have changed or moved, updating bounds that have changed, and clearing paint invalidation state.
     virtual void invalidateTreeIfNeeded(PaintInvalidationState&);
@@ -1272,7 +1272,6 @@ public:
     class MutableForPainting {
     public:
         void setPreviousPaintOffset(const LayoutPoint& paintOffset) { m_layoutObject.setPreviousPaintOffset(paintOffset); }
-        void invalidatePaintIfNeeded(const PaintInfo& paintInfo) { m_layoutObject.invalidatePaintIfNeededForSynchronizedPainting(paintInfo); }
 
     private:
         friend class LayoutObject;
@@ -1411,13 +1410,14 @@ protected:
 
     virtual void invalidatePaintOfSubtreesIfNeeded(PaintInvalidationState& childPaintInvalidationState);
     virtual PaintInvalidationReason invalidatePaintIfNeeded(PaintInvalidationState&, const LayoutBoxModelObject& paintInvalidationContainer);
-    void invalidatePaintIfNeededForSynchronizedPainting(const PaintInfo&);
 
     // When this object is invalidated for paint, this method is called to invalidate any DisplayItemClients
     // owned by this object, including the object itself, LayoutText/LayoutInline line boxes, etc.,
     // not including children which will be invalidated normally during invalidateTreeIfNeeded() and
     // parts which are invalidated separately (e.g. scrollbars).
-    virtual void invalidateDisplayItemClients(const LayoutBoxModelObject& paintInvalidationContainer, PaintInvalidationReason, const LayoutRect& previousPaintInvalidationRect, const LayoutRect& newPaintInvalidationRect) const;
+    // |paintInvalidationRect| can be nullptr if we know it's unchanged and PaintController has cached the
+    // previous value; otherwise we must pass a correct value.
+    virtual void invalidateDisplayItemClients(const LayoutBoxModelObject& paintInvalidationContainer, PaintInvalidationReason, const LayoutRect* paintInvalidationRect) const;

[chrishtr, 2015/10/23 17:15:07]

rename to visibleContentRect? Can skip for this CL if you want.

[Xianzhu, 2015/10/23 18:43:27]

I think we can keep paintInvalidationRect in LayoutObject classes for a while
because the name states that it's in the coordinates of
paintInvalidationContainer.

Renamed paintInvalidationRect and bounds to visibleContentRect in
CompositedLayerMapping, GraphicsLayer and PaintController because
paintInvalidationRect doesn't have clear meaning in these context.

 
     void setIsBackgroundAttachmentFixedObject(bool);
 
@@ -1493,7 +1493,7 @@ private:
     static bool isAllowedToModifyLayoutTreeStructure(Document&);
 
     // The passed rect is mutated into the coordinate space of the paint invalidation container.
-    const LayoutBoxModelObject* invalidatePaintRectangleInternal(LayoutRect&) const;
+    const LayoutBoxModelObject* invalidatePaintRectangleInternal(const LayoutRect&) const;
 
     static LayoutPoint uninitializedPaintOffset() { return LayoutPoint(LayoutUnit::max(), LayoutUnit::max()); }