CONTINUED Make FrameSelection to hold non-canonicalized positions

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

Index: third_party/WebKit/Source/core/dom/Document.h
diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
index 19e980feb4ccc63b391e0c9fc45433d3568c993f..e8cd12e90cc7151163c41868251fdaeeb91cab00 100644
--- a/third_party/WebKit/Source/core/dom/Document.h
+++ b/third_party/WebKit/Source/core/dom/Document.h
@@ -78,7 +78,6 @@ class Attr;
 class CDATASection;
 class CSSStyleSheet;
 class CanvasFontCache;
-class CharacterData;
 class ChromeClient;
 class CompositorPendingAnimations;
 class Comment;
@@ -750,15 +749,15 @@ class CORE_EXPORT Document : public ContainerNode,
   void nodeChildrenWillBeRemoved(ContainerNode&);
   // nodeWillBeRemoved is only safe when removing one node at a time.
   void nodeWillBeRemoved(Node&);
-  // Called just before a destructive update to some CharacterData.
-  void dataWillChange(const CharacterData&);
   bool canAcceptChild(const Node& newChild,
                       const Node* oldChild,
                       ExceptionState&) const;
 
   void didInsertText(Node*, unsigned offset, unsigned length);
   void didRemoveText(Node*, unsigned offset, unsigned length);
-  void didMergeTextNodes(Text& oldNode, unsigned offset);
+  void didMergeTextNodes(const Text& mergedNode,
+                         const Text& nodeToBeRemoved,
+                         unsigned oldLength);
   void didSplitTextNode(const Text& oldNode);
 
   void clearDOMWindow() { m_domWindow = nullptr; }