CONTINUED Make FrameSelection to hold non-canonicalized positions

third_party/WebKit/Source/core/dom/DocumentTest.cpp

Index: third_party/WebKit/Source/core/dom/DocumentTest.cpp
diff --git a/third_party/WebKit/Source/core/dom/DocumentTest.cpp b/third_party/WebKit/Source/core/dom/DocumentTest.cpp
index 13a714aefa3fab90d5f50d28f3931cdc8269ba81..49b6b3864131b9b599cba6df9f0b43ced1136e87 100644
--- a/third_party/WebKit/Source/core/dom/DocumentTest.cpp
+++ b/third_party/WebKit/Source/core/dom/DocumentTest.cpp
@@ -30,6 +30,7 @@
 
 #include "core/dom/Document.h"
 
+#include "core/dom/NodeWithIndex.h"
 #include "core/dom/SynchronousMutationObserver.h"
 #include "core/dom/Text.h"
 #include "core/frame/FrameView.h"
@@ -79,13 +80,21 @@ class TestSynchronousMutationObserver
 
  public:
   struct MergeTextNodesRecord : GarbageCollected<MergeTextNodesRecord> {
-    Member<Text> m_node;
+    Member<const Text> m_node;
+    Member<Node> m_nodeToBeRemoved;
     unsigned m_offset = 0;
 
-    MergeTextNodesRecord(Text* node, unsigned offset)
-        : m_node(node), m_offset(offset) {}
+    MergeTextNodesRecord(const Text* node,
+                         const NodeWithIndex& nodeWithIndex,
+                         unsigned offset)
+        : m_node(node),
+          m_nodeToBeRemoved(nodeWithIndex.node()),
+          m_offset(offset) {}
 
-    DEFINE_INLINE_TRACE() { visitor->trace(m_node); }
+    DEFINE_INLINE_TRACE() {
+      visitor->trace(m_node);
+      visitor->trace(m_nodeToBeRemoved);
+    }
   };
 
   struct UpdateCharacterDataRecord
@@ -146,7 +155,7 @@ class TestSynchronousMutationObserver
   // Implement |SynchronousMutationObserver| member functions.
   void contextDestroyed(Document*) final;
   void didChangeChildren(const ContainerNode&) final;
-  void didMergeTextNodes(Text&, unsigned) final;
+  void didMergeTextNodes(const Text&, const NodeWithIndex&, unsigned) final;
   void didSplitTextNode(const Text&) final;
   void didUpdateCharacterData(CharacterData*,
                               unsigned offset,
@@ -180,9 +189,12 @@ void TestSynchronousMutationObserver::didChangeChildren(
   m_childrenChangedNodes.push_back(&container);
 }
 
-void TestSynchronousMutationObserver::didMergeTextNodes(Text& node,
-                                                        unsigned offset) {
-  m_mergeTextNodesRecords.push_back(new MergeTextNodesRecord(&node, offset));
+void TestSynchronousMutationObserver::didMergeTextNodes(
+    const Text& node,
+    const NodeWithIndex& nodeWithIndex,
+    unsigned offset) {
+  m_mergeTextNodesRecords.append(
+      new MergeTextNodesRecord(&node, nodeWithIndex, offset));
 }
 
 void TestSynchronousMutationObserver::didSplitTextNode(const Text& node) {
@@ -509,7 +521,9 @@ TEST_F(DocumentTest, SynchronousMutationNotifierMergeTextNodes) {
   document().body()->normalize();
 
   ASSERT_EQ(observer.mergeTextNodesRecords().size(), 1u);
-  EXPECT_EQ(observer.mergeTextNodesRecords()[0]->m_node, mergeSampleB);
+  EXPECT_EQ(mergeSampleA, observer.mergeTextNodesRecords()[0]->m_node);
+  EXPECT_EQ(mergeSampleB,
+            observer.mergeTextNodesRecords()[0]->m_nodeToBeRemoved);
   EXPECT_EQ(observer.mergeTextNodesRecords()[0]->m_offset, 10u);
 }