CONTINUED Make FrameSelection to hold non-canonicalized positions

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 "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Text.h"
@@ skipping 15 matching lines @@
 #include <memory>
 
 namespace blink {
 
 class FrameSelectionTest : public EditingTestBase {
  protected:
   const VisibleSelection& visibleSelectionInDOMTree() const {
     return selection().selection();
   }
   const VisibleSelectionInFlatTree& visibleSelectionInFlatTree() const {
-    return selection().selectionInFlatTree();
+    return selection().computeVisibleSelectionInFlatTree();
   }
 
   Text* appendTextNode(const String& data);
   int layoutCount() const {
     return dummyPageHolder().frameView().layoutCount();
   }
 
   bool shouldPaintCaretForTesting() const {
     return selection().shouldPaintCaretForTesting();
   }
@@ skipping 37 matching lines @@
   EXPECT_FALSE(selection().isCaretBoundsDirty());
 
   document().body()->removeChild(text);
   document().updateStyleAndLayoutIgnorePendingStylesheets();
   selection().setCaretRectNeedsUpdate();
   EXPECT_TRUE(selection().isCaretBoundsDirty());
   selection().invalidateCaretRect();
   EXPECT_FALSE(selection().isCaretBoundsDirty());
 }
 
+// TODO(yosin): We should get rid of |PaintCaretShouldNotLayout| since
+// |FrameSelection::paintCaret()| requires up-to-date layout.
+#if 0
 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(
@@ skipping 11 matching lines @@
     dummyPageHolder().frameView().setFrameRect(frameRect);
   }
   std::unique_ptr<PaintController> paintController = PaintController::create();
   {
     GraphicsContext context(*paintController);
     selection().paintCaret(context, LayoutPoint());
   }
   paintController->commitNewDisplayItems();
   EXPECT_EQ(startCount, layoutCount());
 }
+#endif
 
 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);
@@ skipping 13 matching lines @@
   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(selection().isCaretBoundsDirty());
   // "H" remains so early previousCaret invalidation isn't needed.
-  EXPECT_TRUE(isPreviousCaretDirtyForTesting());
+  EXPECT_FALSE(isPreviousCaretDirtyForTesting());
   selection().invalidateCaretRect();
   EXPECT_FALSE(selection().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());
@@ skipping 109 matching lines @@
 // "SelectionControllerTest.cpp"
 class SelectionControllerTest : public EditingTestBase {
  protected:
   SelectionControllerTest() = default;
 
   const VisibleSelection& visibleSelectionInDOMTree() const {
     return selection().selection();
   }
 
   const VisibleSelectionInFlatTree& visibleSelectionInFlatTree() const {
-    return selection().selectionInFlatTree();
+    return selection().computeVisibleSelectionInFlatTree();
   }
 
   void setNonDirectionalSelectionIfNeeded(const VisibleSelectionInFlatTree&,
                                           TextGranularity);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SelectionControllerTest);
 };
 
 TEST_F(FrameSelectionTest, SelectAllWithUnselectableRoot) {
   Element* select = document().createElement("select");
   document().replaceChild(select, document().documentElement());
   selection().selectAll();
   EXPECT_TRUE(selection().isNone()) << "Nothing should be selected if the "
                                        "content of the documentElement is not "
                                        "selctable.";
 }
 
 TEST_F(FrameSelectionTest, updateIfNeededAndFrameCaret) {
   setBodyContent("<style id=sample></style>");
   document().setDesignMode("on");
   updateAllLifecyclePhases();
   Element* sample = document().getElementById("sample");
   selection().setSelection(
       SelectionInDOMTree::Builder().collapse(Position(sample, 0)).build());
   EXPECT_EQ(Position(document().body(), 0), selection().start());
   EXPECT_EQ(selection().start(), caretPosition().position());
   document().body()->remove();
-  // TODO(yosin): Once lazy canonicalization implemented, selection.start
-  // should be Position(HTML, 0).
-  EXPECT_EQ(Position(document().documentElement(), 1), selection().start());
+  EXPECT_EQ(Position(), selection().start())
+      << "Selection has been removed by BODY.remove().";
   EXPECT_EQ(selection().start(), caretPosition().position());
   document().updateStyleAndLayout();
   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.";
+      << "updateIfNeeded() does nothing.";
   EXPECT_EQ(selection().start(), caretPosition().position());
 }
 
 }  // namespace blink