| Index: third_party/WebKit/Source/core/frame/FrameView.h
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
|
| index ce1d5d8ff520e0ca933b14ef4e3446a1896b369a..478175a59ca7b6abd723721afdb2e433e27d994d 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.h
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.h
|
| @@ -63,7 +63,6 @@
|
| class Element;
|
| class FloatSize;
|
| class HTMLFrameOwnerElement;
|
| -class JSONArray;
|
| class LayoutPart;
|
| class LocalFrame;
|
| class KURL;
|
| @@ -322,11 +321,8 @@
|
|
|
| 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*);
|
| @@ -823,6 +819,8 @@
|
|
|
| bool m_safeToPropagateScrollToParent;
|
|
|
| + bool m_isTrackingPaintInvalidations; // Used for testing.
|
| +
|
| unsigned m_visuallyNonEmptyCharacterCount;
|
| unsigned m_visuallyNonEmptyPixelCount;
|
| bool m_isVisuallyNonEmpty;
|
| @@ -920,13 +918,6 @@
|
| 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)
|
|
|