Merge the Sky Engine changes from the SkyDart branch

sky/engine/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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "sky/engine/config.h"
 #include "sky/engine/core/dom/CharacterData.h"
 
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
+#include "sky/engine/bindings2/exception_state.h"
 #include "sky/engine/core/dom/Document.h"
 #include "sky/engine/core/dom/ExceptionCode.h"
 #include "sky/engine/core/dom/MutationObserverInterestGroup.h"
 #include "sky/engine/core/dom/MutationRecord.h"
 #include "sky/engine/core/dom/Text.h"
 #include "sky/engine/core/editing/FrameSelection.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/wtf/CheckedArithmetic.h"
 
 namespace blink {
@@ skipping 13 matching lines @@
 
     unsigned oldLength = length();
 
     setDataAndUpdate(nonNullData, 0, oldLength, nonNullData.length());
     document().didRemoveText(this, 0, oldLength);
 }
 
 String CharacterData::substringData(unsigned offset, unsigned count, ExceptionState& exceptionState)
 {
     if (offset > length()) {
-        exceptionState.throwDOMException(IndexSizeError, "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ").");
+        exceptionState.ThrowDOMException(IndexSizeError, "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ").");
         return String();
     }
 
     return m_data.substring(offset, count);
 }
 
 void CharacterData::parserAppendData(const String& string)
 {
     unsigned oldLength = m_data.length();
     m_data = m_data + string;
@@ skipping 13 matching lines @@
     String newStr = m_data + data;
 
     setDataAndUpdate(newStr, m_data.length(), 0, data.length());
 
     // FIXME: Should we call textInserted here?
 }
 
 void CharacterData::insertData(unsigned offset, const String& data, ExceptionState& exceptionState, RecalcStyleBehavior recalcStyleBehavior)
 {
     if (offset > length()) {
-        exceptionState.throwDOMException(IndexSizeError, "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ").");
+        exceptionState.ThrowDOMException(IndexSizeError, "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ").");
         return;
     }
 
     String newStr = m_data;
     newStr.insert(data, offset);
 
     setDataAndUpdate(newStr, offset, 0, data.length(), recalcStyleBehavior);
 
     document().didInsertText(this, offset, data.length());
 }
 
 static bool validateOffsetCount(unsigned offset, unsigned count, unsigned length, unsigned& realCount, ExceptionState& exceptionState)
 {
     if (offset > length) {
-        exceptionState.throwDOMException(IndexSizeError, "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length) + ").");
+        exceptionState.ThrowDOMException(IndexSizeError, "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length) + ").");
         return false;
     }
 
     Checked<unsigned, RecordOverflow> offsetCount = offset;
     offsetCount += count;
 
     if (offsetCount.hasOverflowed() || offset + count > length)
         realCount = length - offset;
     else
         realCount = count;
@@ skipping 67 matching lines @@
 {
     return static_cast<int>(length());
 }
 
 bool CharacterData::offsetInCharacters() const
 {
     return true;
 }
 
 } // namespace blink