Revert of Let FrameView track object paint invalidations

third_party/WebKit/Source/core/frame/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ skipping 45 matching lines @@
 namespace blink {
 
 class AXObjectCache;
 class CancellableTaskFactory;
 class ComputedStyle;
 class DocumentLifecycle;
 class Cursor;
 class Element;
 class FloatSize;
 class HTMLFrameOwnerElement;
-class JSONArray;
 class LayoutPart;
 class LocalFrame;
 class KURL;
 class Node;
 class LayoutAnalyzer;
 class LayoutBox;
 class LayoutEmbeddedObject;
 class LayoutObject;
 class LayoutReplaced;
 class LayoutScrollbarPart;
@@ skipping 238 matching lines @@
     // FIXME: Remove this method once plugin loading is decoupled from layout.
     void flushAnyPendingPostLayoutTasks();
 
     bool shouldSuspendScrollAnimations() const override;
     void scrollbarStyleChanged() override;
 
     LayoutReplaced* embeddedReplacedContent() const;
 
     static void setInitialTracksPaintInvalidationsForTesting(bool);
 
-    // These methods are for testing.
     void setTracksPaintInvalidations(bool);
-    bool isTrackingPaintInvalidations() const { return m_trackedObjectPaintInvalidations.get(); }
-    void trackObjectPaintInvalidation(const DisplayItemClient&, PaintInvalidationReason);
-    PassRefPtr<JSONArray> trackedObjectPaintInvalidationsAsJSON() const;
+    bool isTrackingPaintInvalidations() const { return m_isTrackingPaintInvalidations; }
 
     using ScrollableAreaSet = HeapHashSet<Member<ScrollableArea>>;
     void addScrollableArea(ScrollableArea*);
     void removeScrollableArea(ScrollableArea*);
     const ScrollableAreaSet* scrollableAreas() const { return m_scrollableAreas.get(); }
 
     void addAnimatingScrollableArea(ScrollableArea*);
     void removeAnimatingScrollableArea(ScrollableArea*);
     const ScrollableAreaSet* animatingScrollableAreas() const { return m_animatingScrollableAreas.get(); }
 
@@ skipping 476 matching lines @@
     bool m_isTransparent;
     Color m_baseBackgroundColor;
     IntSize m_lastViewportSize;
     float m_lastZoomFactor;
 
     AtomicString m_mediaType;
     AtomicString m_mediaTypeWhenNotPrinting;
 
     bool m_safeToPropagateScrollToParent;
 
+    bool m_isTrackingPaintInvalidations; // Used for testing.
+
     unsigned m_visuallyNonEmptyCharacterCount;
     unsigned m_visuallyNonEmptyPixelCount;
     bool m_isVisuallyNonEmpty;
 
     Member<Node> m_fragmentAnchor;
 
     // layoutObject to hold our custom scroll corner.
     LayoutScrollbarPart* m_scrollCorner;
 
     Member<ScrollableAreaSet> m_scrollableAreas;
@@ skipping 77 matching lines @@
     // The content clip clips the document (= LayoutView) but not the scrollbars.
     // TODO(trchen): This will not be needed once settings->rootLayerScrolls() is enabled.
     RefPtr<ClipPaintPropertyNode> m_contentClip;
 
     bool m_isUpdatingAllLifecyclePhases;
     ScrollAnchor m_scrollAnchor;
 
     bool m_needsScrollbarsUpdate;
     bool m_suppressAdjustViewSize;
     bool m_inPluginUpdate;
-
-    // For testing.
-    struct ObjectPaintInvalidation {
-        String name;
-        PaintInvalidationReason reason;
-    };
-    OwnPtr<Vector<ObjectPaintInvalidation>> m_trackedObjectPaintInvalidations;
 };
 
 inline void FrameView::incrementVisuallyNonEmptyCharacterCount(unsigned count)
 {
     if (m_isVisuallyNonEmpty)
         return;
     m_visuallyNonEmptyCharacterCount += count;
     // Use a threshold value to prevent very small amounts of visible content from triggering didMeaningfulLayout.
     // The first few hundred characters rarely contain the interesting content of the page.
     static const unsigned visualCharacterThreshold = 200;
@@ skipping 11 matching lines @@
     if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
         setIsVisuallyNonEmpty();
 }
 
 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFrameView());
 DEFINE_TYPE_CASTS(FrameView, ScrollableArea, scrollableArea, scrollableArea->isFrameView(), scrollableArea.isFrameView());
 
 } // namespace blink
 
 #endif // FrameView_h