Make SynchronousMutationObserver::didMergeTextNodes() to take both merged and merging nodes

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

 /*
  * Copyright (c) 2014, Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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"
 #include "core/html/HTMLHeadElement.h"
 #include "core/html/HTMLLinkElement.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/ReferrerPolicy.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "platform/weborigin/SecurityOrigin.h"
@@ skipping 29 matching lines @@
 
 namespace {
 
 class TestSynchronousMutationObserver
     : public GarbageCollectedFinalized<TestSynchronousMutationObserver>,
       public SynchronousMutationObserver {
   USING_GARBAGE_COLLECTED_MIXIN(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
       : GarbageCollected<UpdateCharacterDataRecord> {
     Member<CharacterData> m_node;
     unsigned m_offset = 0;
     unsigned m_oldLength = 0;
     unsigned m_newLength = 0;
 
     UpdateCharacterDataRecord(CharacterData* node,
@@ skipping 44 matching lines @@
   updatedCharacterDataRecords() const {
     return m_updatedCharacterDataRecords;
   }
 
   DECLARE_TRACE();
 
  private:
   // 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 didMoveTreeToNewDocument(const Node& root) final;
   void didSplitTextNode(const Text&) final;
   void didUpdateCharacterData(CharacterData*,
                               unsigned offset,
                               unsigned oldLength,
                               unsigned newLength) final;
   void nodeChildrenWillBeRemoved(ContainerNode&) final;
   void nodeWillBeRemoved(Node&) final;
 
   int m_contextDestroyedCalledCounter = 0;
@@ skipping 15 matching lines @@
 
 void TestSynchronousMutationObserver::contextDestroyed(Document*) {
   ++m_contextDestroyedCalledCounter;
 }
 
 void TestSynchronousMutationObserver::didChangeChildren(
     const ContainerNode& container) {
   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.push_back(
+      new MergeTextNodesRecord(&node, nodeWithIndex, offset));
 }
 
 void TestSynchronousMutationObserver::didMoveTreeToNewDocument(
     const Node& root) {
   m_moveTreeToNewDocumentNodes.push_back(&root);
 }
 
 void TestSynchronousMutationObserver::didSplitTextNode(const Text& node) {
   m_splitTextNodes.push_back(&node);
 }
@@ skipping 312 matching lines @@
   Text* mergeSampleA = document().createTextNode("a123456789");
   document().body()->appendChild(mergeSampleA);
 
   Text* mergeSampleB = document().createTextNode("b123456789");
   document().body()->appendChild(mergeSampleB);
 
   EXPECT_EQ(0u, observer.mergeTextNodesRecords().size());
   document().body()->normalize();
 
   ASSERT_EQ(1u, observer.mergeTextNodesRecords().size());
-  EXPECT_EQ(mergeSampleB, observer.mergeTextNodesRecords()[0]->m_node);
+  EXPECT_EQ(mergeSampleA, observer.mergeTextNodesRecords()[0]->m_node);
+  EXPECT_EQ(mergeSampleB,
+            observer.mergeTextNodesRecords()[0]->m_nodeToBeRemoved);
   EXPECT_EQ(10u, observer.mergeTextNodesRecords()[0]->m_offset);
 }
 
 TEST_F(DocumentTest, SynchronousMutationNotifierMoveTreeToNewDocument) {
   auto& observer = *new TestSynchronousMutationObserver(document());
 
   Node* moveSample = document().createElement("div");
   moveSample->appendChild(document().createTextNode("a123"));
   moveSample->appendChild(document().createTextNode("b456"));
   document().body()->appendChild(moveSample);
@@ skipping 95 matching lines @@
   {
     setHtmlInnerHTML(
         "<body>"
         "<meta name=\"theme-color\" content=\"#00ff00\">");
     EXPECT_EQ(Color(0, 255, 0), document().themeColor())
         << "Theme color should be bright green.";
   }
 }
 
 }  // namespace blink