| Index: Source/core/dom/CharacterData.cpp
|
| diff --git a/Source/core/dom/CharacterData.cpp b/Source/core/dom/CharacterData.cpp
|
| index 305cad6109d2be5296842553b875dc6ed282bae1..d7f818af911aa1f6fc8e69481268aab746b92f9f 100644
|
| --- a/Source/core/dom/CharacterData.cpp
|
| +++ b/Source/core/dom/CharacterData.cpp
|
| @@ -58,10 +58,10 @@ void CharacterData::setData(const String& data)
|
| document().didRemoveText(this, 0, oldLength);
|
| }
|
|
|
| -String CharacterData::substringData(unsigned offset, unsigned count, ExceptionState& es)
|
| +String CharacterData::substringData(unsigned offset, unsigned count, ExceptionState& exceptionState)
|
| {
|
| if (offset > length()) {
|
| - es.throwDOMException(IndexSizeError, ExceptionMessages::failedToExecute("substringData", "CharacterData", "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ")."));
|
| + exceptionState.throwDOMException(IndexSizeError, ExceptionMessages::failedToExecute("substringData", "CharacterData", "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ")."));
|
| return String();
|
| }
|
|
|
| @@ -92,10 +92,10 @@ void CharacterData::appendData(const String& data)
|
| // FIXME: Should we call textInserted here?
|
| }
|
|
|
| -void CharacterData::insertData(unsigned offset, const String& data, ExceptionState& es, RecalcStyleBehavior recalcStyleBehavior)
|
| +void CharacterData::insertData(unsigned offset, const String& data, ExceptionState& exceptionState, RecalcStyleBehavior recalcStyleBehavior)
|
| {
|
| if (offset > length()) {
|
| - es.throwDOMException(IndexSizeError, ExceptionMessages::failedToExecute("insertData", "CharacterData", "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ")."));
|
| + exceptionState.throwDOMException(IndexSizeError, ExceptionMessages::failedToExecute("insertData", "CharacterData", "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ")."));
|
| return;
|
| }
|
|
|
| @@ -107,10 +107,10 @@ void CharacterData::insertData(unsigned offset, const String& data, ExceptionSta
|
| document().didInsertText(this, offset, data.length());
|
| }
|
|
|
| -void CharacterData::deleteData(unsigned offset, unsigned count, ExceptionState& es, RecalcStyleBehavior recalcStyleBehavior)
|
| +void CharacterData::deleteData(unsigned offset, unsigned count, ExceptionState& exceptionState, RecalcStyleBehavior recalcStyleBehavior)
|
| {
|
| if (offset > length()) {
|
| - es.throwDOMException(IndexSizeError, ExceptionMessages::failedToExecute("deleteData", "CharacterData", "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ")."));
|
| + exceptionState.throwDOMException(IndexSizeError, ExceptionMessages::failedToExecute("deleteData", "CharacterData", "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ")."));
|
| return;
|
| }
|
|
|
| @@ -128,10 +128,10 @@ void CharacterData::deleteData(unsigned offset, unsigned count, ExceptionState&
|
| document().didRemoveText(this, offset, realCount);
|
| }
|
|
|
| -void CharacterData::replaceData(unsigned offset, unsigned count, const String& data, ExceptionState& es)
|
| +void CharacterData::replaceData(unsigned offset, unsigned count, const String& data, ExceptionState& exceptionState)
|
| {
|
| if (offset > length()) {
|
| - es.throwDOMException(IndexSizeError, ExceptionMessages::failedToExecute("replaceData", "CharacterData", "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ")."));
|
| + exceptionState.throwDOMException(IndexSizeError, ExceptionMessages::failedToExecute("replaceData", "CharacterData", "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ")."));
|
| return;
|
| }
|
|
|
|
|