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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 4249 matching lines @@
 }
 
 void Document::didRemoveText(Node* text, unsigned offset, unsigned length) {
   for (Range* range : m_ranges)
     range->didRemoveText(text, offset, length);
 
   m_markers->removeMarkers(text, offset, length);
   m_markers->shiftMarkers(text, offset + length, 0 - length);
 }
 
-void Document::didMergeTextNodes(Text& oldNode, unsigned offset) {
+void Document::didMergeTextNodes(const Text& mergedNode,
+                                 const Text& nodeToBeRemoved,
+                                 unsigned oldLength) {
+  NodeWithIndex nodeToBeRemovedWithIndex(const_cast<Text&>(nodeToBeRemoved));
   if (!m_ranges.isEmpty()) {
-    NodeWithIndex oldNodeWithIndex(oldNode);
     for (Range* range : m_ranges)
-      range->didMergeTextNodes(oldNodeWithIndex, offset);
+      range->didMergeTextNodes(nodeToBeRemovedWithIndex, oldLength);
   }
 
-  notifyMergeTextNodes(oldNode, offset);
+  notifyMergeTextNodes(mergedNode, nodeToBeRemovedWithIndex, oldLength);
   if (m_frame)
-    m_frame->selection().didMergeTextNodes(oldNode, offset);
+    m_frame->selection().didMergeTextNodes(nodeToBeRemoved, oldLength);
 
   // FIXME: This should update markers for spelling and grammar checking.
 }
 
 void Document::didSplitTextNode(const Text& oldNode) {
   for (Range* range : m_ranges)
     range->didSplitTextNode(oldNode);
 
   notifySplitTextNode(oldNode);
   if (m_frame)
@@ skipping 2248 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->url().getString().utf8().data());
 }
 #endif