CONTINUED Make FrameSelection to hold non-canonicalized positions

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 2470 matching lines @@
     }
   }
 
   styleEngine().didDetach();
 
   frameHost()->eventHandlerRegistry().documentDetached(*this);
 
   // Since |Document| class has multiple |LifecycleNotifier| as base class,
   // we need to have |static_cast<SynchronousMutationNotifier>| here.
   static_cast<SynchronousMutationNotifier*>(this)->notifyContextDestroyed();
-  m_frame->selection().documentDetached(*this);
 
   // If this Document is associated with a live DocumentLoader, the
   // DocumentLoader will take care of clearing the FetchContext. Deferring
   // to the DocumentLoader when possible also prevents prematurely clearing
   // the context in the case where multiple Documents end up associated with
   // a single DocumentLoader (e.g., navigating to a javascript: url).
   if (!loader())
     m_fetcher->clearContext();
   // If this document is the master for an HTMLImportsController, sever that
   // relationship. This ensures that we don't leave import loads in flight,
@@ skipping 1708 matching lines @@
   EventDispatchForbiddenScope assertNoEventDispatch;
   for (Range* range : m_ranges)
     range->nodeChildrenWillBeRemoved(container);
 
   for (NodeIterator* ni : m_nodeIterators) {
     for (Node& n : NodeTraversal::childrenOf(container))
       ni->nodeWillBeRemoved(n);
   }
 
   notifyNodeChildrenWillBeRemoved(container);
-  if (LocalFrame* frame = this->frame())
-    frame->selection().nodeChildrenWillBeRemoved(container);
 
   if (containsV1ShadowTree()) {
     for (Node& n : NodeTraversal::childrenOf(container))
       n.checkSlotChangeBeforeRemoved();
   }
 }
 
 void Document::nodeWillBeRemoved(Node& n) {
   for (NodeIterator* ni : m_nodeIterators)
     ni->nodeWillBeRemoved(n);
 
   for (Range* range : m_ranges)
     range->nodeWillBeRemoved(n);
 
   notifyNodeWillBeRemoved(n);
 
-  if (LocalFrame* frame = this->frame()) {
-    frame->selection().nodeWillBeRemoved(n);
-  }
-
   if (containsV1ShadowTree())
     n.checkSlotChangeBeforeRemoved();
 
   if (n.inActiveDocument() && n.isElementNode())
     styleEngine().elementWillBeRemoved(toElement(n));
 }
 
-void Document::dataWillChange(const CharacterData& characterData) {
-  if (LocalFrame* frame = this->frame())
-    frame->selection().dataWillChange(characterData);
-}
-
 void Document::didInsertText(Node* text, unsigned offset, unsigned length) {
   for (Range* range : m_ranges)
     range->didInsertText(text, offset, length);
 
   m_markers->shiftMarkers(text, offset, length);
 }
 
 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);
-  if (m_frame)
-    m_frame->selection().didMergeTextNodes(oldNode, offset);
+  notifyMergeTextNodes(mergedNode, nodeToBeRemovedWithIndex, 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)
-    m_frame->selection().didSplitTextNode(oldNode);
 
   // FIXME: This should update markers for spelling and grammar checking.
 }
 
 void Document::setWindowAttributeEventListener(const AtomicString& eventType,
                                                EventListener* listener) {
   LocalDOMWindow* domWindow = this->domWindow();
   if (!domWindow)
     return;
   domWindow->setAttributeEventListener(eventType, listener);
@@ skipping 2215 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