Invalidate caret during paint invalidation

third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/editing/FrameSelection.h"
 
+#include <memory>
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Text.h"
 #include "core/editing/EditingTestBase.h"
 #include "core/editing/FrameCaret.h"
 #include "core/editing/SelectionController.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLBodyElement.h"
 #include "core/input/EventHandler.h"
+#include "core/layout/LayoutBlock.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/PaintLayer.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/graphics/paint/PaintController.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/StdLibExtras.h"
-#include <memory>
 
 namespace blink {
 
 class FrameSelectionTest : public EditingTestBase {
  protected:
   const VisibleSelection& visibleSelectionInDOMTree() const {
     return selection().selection();
   }
   const VisibleSelectionInFlatTree& visibleSelectionInFlatTree() const {
     return selection().selectionInFlatTree();
   }
 
   Text* appendTextNode(const String& data);
   int layoutCount() const {
     return dummyPageHolder().frameView().layoutCount();
   }
 
-  bool isCaretBoundsDirty() const {
-    return selection().m_frameCaret->m_caretRectDirty;
-  }
-
-  bool shouldPaintCaretForTesting() const {
-    return selection().shouldPaintCaretForTesting();
-  }
-  bool isPreviousCaretDirtyForTesting() const {
-    return selection().isPreviousCaretDirtyForTesting();
-  }
-
   PositionWithAffinity caretPosition() const {
     return selection().m_frameCaret->caretPosition();
   }
 
  private:
   Persistent<Text> m_textNode;
 };
 
 Text* FrameSelectionTest::appendTextNode(const String& data) {
   Text* text = document().createTextNode(data);
   document().body()->appendChild(text);
   return text;
 }
 
 TEST_F(FrameSelectionTest, SetValidSelection) {
   Text* text = appendTextNode("Hello, World!");
   document().view()->updateAllLifecyclePhases();
   selection().setSelection(
       SelectionInDOMTree::Builder()
           .setBaseAndExtent(Position(text, 0), Position(text, 5))
           .build());
   EXPECT_FALSE(selection().isNone());
 }
 
-TEST_F(FrameSelectionTest, InvalidateCaretRect) {
-  Text* text = appendTextNode("Hello, World!");
-  document().view()->updateAllLifecyclePhases();
-
-  selection().setSelection(
-      SelectionInDOMTree::Builder().collapse(Position(text, 0)).build());
-  selection().setCaretRectNeedsUpdate();
-  EXPECT_TRUE(isCaretBoundsDirty());
-  selection().invalidateCaretRect();
-  EXPECT_FALSE(isCaretBoundsDirty());
-
-  document().body()->removeChild(text);
-  document().updateStyleAndLayoutIgnorePendingStylesheets();
-  selection().setCaretRectNeedsUpdate();
-  EXPECT_TRUE(isCaretBoundsDirty());
-  selection().invalidateCaretRect();
-  EXPECT_FALSE(isCaretBoundsDirty());
-}
-
 TEST_F(FrameSelectionTest, PaintCaretShouldNotLayout) {
   Text* text = appendTextNode("Hello, World!");
   document().view()->updateAllLifecyclePhases();
 
   document().body()->setContentEditable("true", ASSERT_NO_EXCEPTION);
   document().body()->focus();
   EXPECT_TRUE(document().body()->isFocused());
 
   selection().setCaretVisible(true);
   selection().setSelection(
       SelectionInDOMTree::Builder().collapse(Position(text, 0)).build());
+  document().view()->updateAllLifecyclePhases();
   EXPECT_TRUE(selection().isCaret());
-  EXPECT_TRUE(shouldPaintCaretForTesting());
+  EXPECT_TRUE(toLayoutBlock(document().body()->layoutObject())
+                  ->shouldPaintCursorCaret());
 
   int startCount = layoutCount();
   {
     // To force layout in next updateLayout calling, widen view.
     FrameView& frameView = dummyPageHolder().frameView();
     IntRect frameRect = frameView.frameRect();
     frameRect.setWidth(frameRect.width() + 1);
     frameRect.setHeight(frameRect.height() + 1);
     dummyPageHolder().frameView().setFrameRect(frameRect);
   }
   std::unique_ptr<PaintController> paintController = PaintController::create();
   {
     GraphicsContext context(*paintController);
     selection().paintCaret(context, LayoutPoint());
   }
   paintController->commitNewDisplayItems();
   EXPECT_EQ(startCount, layoutCount());
 }
 
-TEST_F(FrameSelectionTest, InvalidatePreviousCaretAfterRemovingLastCharacter) {
-  Text* text = appendTextNode("Hello, World!");
-  document().view()->updateAllLifecyclePhases();
-
-  document().body()->setContentEditable("true", ASSERT_NO_EXCEPTION);
-  document().body()->focus();
-  EXPECT_TRUE(document().body()->isFocused());
-
-  selection().setCaretVisible(true);
-  EXPECT_TRUE(selection().isCaret());
-  EXPECT_TRUE(shouldPaintCaretForTesting());
-
-  // Simulate to type "Hello, World!".
-  DisableCompositingQueryAsserts disabler;
-  document().updateStyleAndLayout();
-  selection().setSelection(
-      SelectionInDOMTree::Builder().collapse(selection().end()).build());
-  selection().setCaretRectNeedsUpdate();
-  EXPECT_TRUE(isCaretBoundsDirty());
-  EXPECT_FALSE(isPreviousCaretDirtyForTesting());
-  selection().invalidateCaretRect();
-  EXPECT_FALSE(isCaretBoundsDirty());
-  EXPECT_TRUE(isPreviousCaretDirtyForTesting());
-
-  // Simulate to remove all except for "H".
-  text->replaceWholeText("H");
-  document().updateStyleAndLayout();
-  selection().setSelection(
-      SelectionInDOMTree::Builder().collapse(selection().end()).build());
-  selection().setCaretRectNeedsUpdate();
-  EXPECT_TRUE(isCaretBoundsDirty());
-  // "H" remains so early previousCaret invalidation isn't needed.
-  EXPECT_TRUE(isPreviousCaretDirtyForTesting());
-  selection().invalidateCaretRect();
-  EXPECT_FALSE(isCaretBoundsDirty());
-  EXPECT_TRUE(isPreviousCaretDirtyForTesting());
-
-  // Simulate to remove the last character.
-  document().body()->removeChild(text);
-  // This line is the objective of this test.
-  // As removing the last character, early previousCaret invalidation is
-  // executed.
-  EXPECT_FALSE(isPreviousCaretDirtyForTesting());
-  document().updateStyleAndLayoutIgnorePendingStylesheets();
-  selection().setCaretRectNeedsUpdate();
-  EXPECT_TRUE(isCaretBoundsDirty());
-  EXPECT_FALSE(isPreviousCaretDirtyForTesting());
-  selection().invalidateCaretRect();
-  EXPECT_FALSE(isCaretBoundsDirty());
-  EXPECT_TRUE(isPreviousCaretDirtyForTesting());
-}
-
 #define EXPECT_EQ_SELECTED_TEXT(text) \
   EXPECT_EQ(text, WebString(selection().selectedText()).utf8())
 
 TEST_F(FrameSelectionTest, SelectWordAroundPosition) {
   // "Foo Bar  Baz,"
   Text* text = appendTextNode("Foo Bar&nbsp;&nbsp;Baz,");
   updateAllLifecyclePhases();
 
   // "Fo|o Bar  Baz,"
   EXPECT_TRUE(selection().selectWordAroundPosition(
@@ skipping 134 matching lines @@
   selection().updateIfNeeded();
 
   // TODO(yosin): Once lazy canonicalization implemented, selection.start
   // should be Position(HTML, 0).
   EXPECT_EQ(Position(), selection().start())
       << "updateIfNeeded() makes selection to null.";
   EXPECT_EQ(selection().start(), caretPosition().position());
 }
 
 }  // namespace blink