Revert of Fix paint invalidation and painting for composited-scrolling input elements.

third_party/WebKit/Source/core/editing/CaretBase.h

Index: third_party/WebKit/Source/core/editing/CaretBase.h
diff --git a/third_party/WebKit/Source/core/editing/CaretBase.h b/third_party/WebKit/Source/core/editing/CaretBase.h
index ea53653aa3ae662ddfe13a1dbf129dae0974efdc..a69b67a91728c8b64ad8b3391916e82c68ca5a17 100644
--- a/third_party/WebKit/Source/core/editing/CaretBase.h
+++ b/third_party/WebKit/Source/core/editing/CaretBase.h
@@ -30,13 +30,11 @@
 #include "core/editing/VisiblePosition.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/LayoutRect.h"
-#include "platform/graphics/paint/DisplayItem.h"
 #include "wtf/Noncopyable.h"
 
 namespace blink {
 
 class CullRect;
-class DisplayItemClient;
 class LocalFrame;
 class GraphicsContext;
 class LayoutBlock;
@@ -60,7 +58,7 @@
     IntRect absoluteBoundsForLocalRect(Node*, const LayoutRect&) const;
     bool shouldRepaintCaret(Node&) const;
     bool shouldRepaintCaret(const LayoutViewItem) const;
-    void paintCaret(Node*, GraphicsContext&, const LayoutPoint&, DisplayItem::Type) const;
+    void paintCaret(Node*, GraphicsContext&, const LayoutPoint&) const;
 
     const LayoutRect& localCaretRectWithoutUpdate() const { return m_caretLocalRect; }
 
@@ -74,8 +72,6 @@
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    static DisplayItemClient* displayItemClientForCaret(Node*);
-
     LayoutRect m_caretLocalRect; // caret rect in coords local to the layoutObject responsible for painting the caret
     CaretVisibility m_caretVisibility;
 };