| Index: third_party/WebKit/Source/core/dom/CharacterData.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/CharacterData.cpp b/third_party/WebKit/Source/core/dom/CharacterData.cpp
|
| index 54d8c1259baa0eab18e32db5ea1ec6b173f9c838..848ecf57fbdb9ebcd43a78fdf935b225e26d9d3c 100644
|
| --- a/third_party/WebKit/Source/core/dom/CharacterData.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/CharacterData.cpp
|
| @@ -78,7 +78,7 @@ void CharacterData::appendData(const String& data)
|
| // FIXME: Should we call textInserted here?
|
| }
|
|
|
| -void CharacterData::insertData(unsigned offset, const String& data, ExceptionState& exceptionState, RecalcStyleBehavior recalcStyleBehavior)
|
| +void CharacterData::insertData(unsigned offset, const String& data, ExceptionState& exceptionState)
|
| {
|
| if (offset > length()) {
|
| exceptionState.throwDOMException(IndexSizeError, "The offset " + String::number(offset) + " is greater than the node's length (" + String::number(length()) + ").");
|
| @@ -88,7 +88,7 @@ void CharacterData::insertData(unsigned offset, const String& data, ExceptionSta
|
| String newStr = m_data;
|
| newStr.insert(data, offset);
|
|
|
| - setDataAndUpdate(newStr, offset, 0, data.length(), UpdateFromNonParser, recalcStyleBehavior);
|
| + setDataAndUpdate(newStr, offset, 0, data.length(), UpdateFromNonParser);
|
|
|
| document().didInsertText(this, offset, data.length());
|
| }
|
| @@ -111,7 +111,7 @@ static bool validateOffsetCount(unsigned offset, unsigned count, unsigned length
|
| return true;
|
| }
|
|
|
| -void CharacterData::deleteData(unsigned offset, unsigned count, ExceptionState& exceptionState, RecalcStyleBehavior recalcStyleBehavior)
|
| +void CharacterData::deleteData(unsigned offset, unsigned count, ExceptionState& exceptionState)
|
| {
|
| unsigned realCount = 0;
|
| if (!validateOffsetCount(offset, count, length(), realCount, exceptionState))
|
| @@ -120,7 +120,7 @@ void CharacterData::deleteData(unsigned offset, unsigned count, ExceptionState&
|
| String newStr = m_data;
|
| newStr.remove(offset, realCount);
|
|
|
| - setDataAndUpdate(newStr, offset, realCount, 0, UpdateFromNonParser, recalcStyleBehavior);
|
| + setDataAndUpdate(newStr, offset, realCount, 0, UpdateFromNonParser);
|
|
|
| document().didRemoveText(this, offset, realCount);
|
| }
|
| @@ -157,7 +157,7 @@ void CharacterData::setNodeValue(const String& nodeValue)
|
| setData(nodeValue);
|
| }
|
|
|
| -void CharacterData::setDataAndUpdate(const String& newData, unsigned offsetOfReplacedData, unsigned oldLength, unsigned newLength, UpdateSource source, RecalcStyleBehavior recalcStyleBehavior)
|
| +void CharacterData::setDataAndUpdate(const String& newData, unsigned offsetOfReplacedData, unsigned oldLength, unsigned newLength, UpdateSource source)
|
| {
|
| if (source != UpdateFromParser)
|
| document().dataWillChange(*this);
|
| @@ -167,7 +167,7 @@ void CharacterData::setDataAndUpdate(const String& newData, unsigned offsetOfRep
|
|
|
| DCHECK(!layoutObject() || isTextNode());
|
| if (isTextNode())
|
| - toText(this)->updateTextLayoutObject(offsetOfReplacedData, oldLength, recalcStyleBehavior);
|
| + toText(this)->updateTextLayoutObject(offsetOfReplacedData, oldLength);
|
|
|
| if (source != UpdateFromParser) {
|
| if (getNodeType() == PROCESSING_INSTRUCTION_NODE)
|
|
|