Index: third_party/WebKit/Source/core/html/HTMLTextFormControlElement.cpp |
diff --git a/third_party/WebKit/Source/core/html/HTMLTextFormControlElement.cpp b/third_party/WebKit/Source/core/html/HTMLTextFormControlElement.cpp |
index 1c8fbe9798b18ed838a2e587644dbb5964e85eab..5722979c105e3e81a9e3e157d4c320d663a2d161 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLTextFormControlElement.cpp |
+++ b/third_party/WebKit/Source/core/html/HTMLTextFormControlElement.cpp |
@@ -632,15 +632,23 @@ void HTMLTextFormControlElement::setInnerEditorValue(const String& value) |
return; |
bool textIsChanged = value != innerEditorValue(); |
- if (textIsChanged || !innerEditorElement()->hasChildren()) { |
- if (textIsChanged && layoutObject()) { |
- if (AXObjectCache* cache = document().existingAXObjectCache()) |
- cache->handleTextFormControlChanged(this); |
- } |
- innerEditorElement()->setInnerText(value, ASSERT_NO_EXCEPTION); |
+ HTMLElement* innerEditor = innerEditorElement(); |
+ if (!textIsChanged && innerEditor->hasChildren()) |
+ return; |
+ |
+ // If the last child is a trailing <br> that's appended below, remove it |
+ // first so as to enable setInnerText() fast path of updating a text node. |
+ if (isHTMLBRElement(innerEditor->lastChild())) |
+ innerEditor->removeChild(innerEditor->lastChild(), ASSERT_NO_EXCEPTION); |
+ |
+ innerEditor->setInnerText(value, ASSERT_NO_EXCEPTION); |
+ |
+ if (value.endsWith('\n') || value.endsWith('\r')) |
+ innerEditor->appendChild(HTMLBRElement::create(document())); |
- if (value.endsWith('\n') || value.endsWith('\r')) |
- innerEditorElement()->appendChild(HTMLBRElement::create(document())); |
+ if (textIsChanged && layoutObject()) { |
+ if (AXObjectCache* cache = document().existingAXObjectCache()) |
+ cache->handleTextFormControlChanged(this); |
} |
} |