Make CaretBase a DisplayItemClient.

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 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 169 matching lines @@
     void didMergeTextNodes(const Text& oldNode, unsigned offset);
     void didSplitTextNode(const Text& oldNode);
 
     bool isAppearanceDirty() const;
     void commitAppearanceIfNeeded(LayoutView&);
     void updateAppearance();
     void setCaretVisible(bool caretIsVisible);
     bool isCaretBoundsDirty() const;
     void setCaretRectNeedsUpdate();
     void scheduleVisualUpdate() const;
-    void invalidateCaretRect();
+    void invalidateCaretRect(bool forceInvalidation = false);
     void paintCaret(GraphicsContext&, const LayoutPoint&);
 
     // Used to suspend caret blinking while the mouse is down.
     void setCaretBlinkingSuspended(bool);
     bool isCaretBlinkingSuspended() const;
 
     // Focus
     void setFocused(bool);
     bool isFocused() const { return m_focused; }
     bool isFocusedAndActive() const;
@@ skipping 38 matching lines @@
     // TODO(yosin): We should check DOM tree version and style version in
     // |FrameSelection::selection()| to make sure we use updated selection,
     // rather than having |updateIfNeeded()|. Once, we update all layout tests
     // to use updated selection, we should make |updateIfNeeded()| private.
     void updateIfNeeded();
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     friend class FrameSelectionTest;
+    friend class PaintControllerPaintTestForSlimmingPaintV1AndV2;
+    FRIEND_TEST_ALL_PREFIXES(PaintControllerPaintTestForSlimmingPaintV1AndV2, FullDocumentPaintingWithCaret);
 
     explicit FrameSelection(LocalFrame*);
 
     // Note: We have |selectionInFlatTree()| for unit tests, we should
     // use |visibleSelection<EditingInFlatTreeStrategy>()|.
     const VisibleSelectionInFlatTree& selectionInFlatTree() const;
 
     template <typename Strategy>
     VisiblePositionTemplate<Strategy> originalBase() const;
     void setOriginalBase(const VisiblePosition&);
@@ skipping 59 matching lines @@
 }
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::FrameSelection&);
 void showTree(const blink::FrameSelection*);
 #endif
 
 #endif // FrameSelection_h