Revert of Let FrameView track object paint invalidations

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.h

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 115 matching lines @@
 
     void setSquashingContentsNeedDisplay();
     void setContentsNeedDisplay();
     // LayoutRect is in the coordinate space of the layer's layout object.
     void setContentsNeedDisplayInRect(const LayoutRect&, PaintInvalidationReason, const DisplayItemClient&);
     // Invalidates just the non-scrolling content layers.
     void setNonScrollingContentsNeedDisplayInRect(const LayoutRect&, PaintInvalidationReason, const DisplayItemClient&);
     // Invalidates just scrolling content layers.
     void setScrollingContentsNeedDisplayInRect(const LayoutRect&, PaintInvalidationReason, const DisplayItemClient&);
 
+    // This is called only if we are tracking paint invalidation for testing, or ENABLE(ASSERT)
+    // for error checking and debugging.
+    void displayItemClientWasInvalidated(const DisplayItemClient&, PaintInvalidationReason);
+    // Invalidates just scrolling content layers.
+    void scrollingDisplayItemClientWasInvalidated(const DisplayItemClient&, PaintInvalidationReason);
+
     // Notification from the layoutObject that its content changed.
     void contentChanged(ContentChangeType);
 
     LayoutRect compositedBounds() const { return m_compositedBounds; }
     IntRect pixelSnappedCompositedBounds() const;
 
     void positionOverflowControlsLayers();
 
     // Returns true if the assignment actually changed the assigned squashing layer.
     bool updateSquashingLayerAssignment(PaintLayer* squashedLayer, size_t nextSquashedLayerIndex);
@@ skipping 308 matching lines @@
 
     unsigned m_backgroundLayerPaintsFixedRootBackground : 1;
     unsigned m_scrollingContentsAreEmpty : 1;
 
     friend class CompositedLayerMappingTest;
 };
 
 } // namespace blink
 
 #endif // CompositedLayerMapping_h