CONTINUED Make FrameSelection to hold non-canonicalized positions

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All
  * rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 11 matching lines @@
 
 #include "core/dom/CharacterData.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/MutationObserverInterestGroup.h"
 #include "core/dom/MutationRecord.h"
 #include "core/dom/ProcessingInstruction.h"
 #include "core/dom/Text.h"
-#include "core/editing/FrameSelection.h"
 #include "core/events/MutationEvent.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "wtf/CheckedNumeric.h"
 
 namespace blink {
 
 void CharacterData::atomize() {
   m_data = AtomicString(m_data);
 }
 
@@ skipping 126 matching lines @@
 }
 
 void CharacterData::setDataAndUpdate(const String& newData,
                                      unsigned offsetOfReplacedData,
                                      unsigned oldLength,
                                      unsigned newLength,
                                      UpdateSource source) {
   String oldData = m_data;
   m_data = newData;
 
-  DCHECK(!layoutObject() || isTextNode());
-  if (isTextNode())
-    toText(this)->updateTextLayoutObject(offsetOfReplacedData, oldLength);
-
+  document().incDOMTreeVersion();
   if (source != UpdateFromParser) {
     if (getNodeType() == kProcessingInstructionNode)
       toProcessingInstruction(this)->didAttributeChanged();
 
     document().notifyUpdateCharacterData(this, offsetOfReplacedData, oldLength,
                                          newLength);
   }
 
-  document().incDOMTreeVersion();
+  DCHECK(!layoutObject() || isTextNode());
+  if (isTextNode())
+    toText(this)->updateTextLayoutObject(offsetOfReplacedData, oldLength);
+
   didModifyData(oldData, source);
 }
 
 void CharacterData::didModifyData(const String& oldData, UpdateSource source) {
   if (MutationObserverInterestGroup* mutationRecipients =
           MutationObserverInterestGroup::createForCharacterDataMutation(*this))
     mutationRecipients->enqueueMutationRecord(
         MutationRecord::createCharacterData(this, oldData));
 
   if (parentNode()) {
@@ skipping 14 matching lines @@
     dispatchSubtreeModifiedEvent();
   }
   InspectorInstrumentation::characterDataModified(this);
 }
 
 int CharacterData::maxCharacterOffset() const {
   return static_cast<int>(length());
 }
 
 }  // namespace blink