Revert of Let FrameView track object paint invalidations

third_party/WebKit/Source/platform/graphics/paint/PaintController.h

 // Copyright 2014 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.
 
 #ifndef PaintController_h
 #define PaintController_h
 
 #include "platform/PlatformExport.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/IntRect.h"
@@ skipping 37 matching lines @@
     {
         // New display items should be committed before PaintController is destructed.
         DCHECK(m_newDisplayItemList.isEmpty());
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
         DisplayItemClient::endShouldKeepAliveAllClients(this);
 #endif
     }
 
     void invalidateAll();
 
+    // Record when paint offsets change during paint.
+    void invalidatePaintOffset(const DisplayItemClient&);
+#if DCHECK_IS_ON()
+    bool paintOffsetWasInvalidated(const DisplayItemClient&) const;
+#endif
+
     // These methods are called during painting.
 
     // Provide a new set of paint chunk properties to apply to recorded display
     // items, for Slimming Paint v2.
     void updateCurrentPaintChunkProperties(const PaintChunkProperties&);
 
     // Retrieve the current paint properties.
     const PaintChunkProperties& currentPaintChunkProperties() const;
 
     template <typename DisplayItemClass, typename... Args>
@@ skipping 66 matching lines @@
     // Returns displayItemList added using createAndAppend() since beginning or
     // the last commitNewDisplayItems(). Use with care.
     DisplayItemList& newDisplayItemList() { return m_newDisplayItemList; }
 
     void appendDebugDrawingAfterCommit(const DisplayItemClient&, PassRefPtr<SkPicture>, const LayoutSize& offsetFromLayoutObject);
 
 #ifndef NDEBUG
     void showDebugData() const;
 #endif
 
+    // This is called only if we are tracking paint invalidation for testing, or DCHECK_IS_ON()
+    // for error checking and debugging.
+    void displayItemClientWasInvalidated(const DisplayItemClient&);
+
 #if DCHECK_IS_ON()
+    bool hasInvalidations() { return !m_invalidations.isEmpty(); }
+#endif
+
+#if DCHECK_IS_ON()
     void assertDisplayItemClientsAreLive();
 #endif
 
 protected:
     PaintController()
         : m_newDisplayItemList(kInitialDisplayItemListCapacityBytes)
         , m_constructionDisabled(false)
         , m_subsequenceCachingDisabled(false)
         , m_textPainted(false)
         , m_imagePainted(false)
@@ skipping 31 matching lines @@
     void updateCacheGeneration();
 
     // The last complete paint artifact.
     // In SPv2, this includes paint chunks as well as display items.
     PaintArtifact m_currentPaintArtifact;
 
     // Data being used to build the next paint artifact.
     DisplayItemList m_newDisplayItemList;
     PaintChunker m_newPaintChunks;
 
+#if DCHECK_IS_ON()
+    // Set of clients which had paint offset changes since the last commit. This is used for
+    // ensuring paint offsets are only updated once and are the same in all phases.
+    HashSet<const DisplayItemClient*> m_clientsWithPaintOffsetInvalidations;
+#endif
+
     // Allow display item construction to be disabled to isolate the costs of construction
     // in performance metrics.
     bool m_constructionDisabled;
 
     // Allow subsequence caching to be disabled to test the cost of display item caching.
     bool m_subsequenceCachingDisabled;
 
     // Indicates this PaintController has ever had text. It is never reset to false.
     bool m_textPainted;
     bool m_imagePainted;
 
     int m_skippingCacheCount;
 
     int m_numCachedNewItems;
 
 #if DCHECK_IS_ON()
+    // Record the debug names of invalidated clients for assertion and debugging.
+    Vector<String> m_invalidations;
+
     // This is used to check duplicated ids during add(). We could also check
     // during commitNewDisplayItems(), but checking during add() helps developer
     // easily find where the duplicated ids are from.
     DisplayItemIndicesByClientMap m_newDisplayItemIndicesByClient;
 #endif
 
     DisplayItemCacheGeneration m_currentCacheGeneration;
 };
 
 } // namespace blink
 
 #endif // PaintController_h