Return correct surroundingText for HTMLTextFormControlElement.

Element::innerText() is always empty for <input> and <textarea>
elements, so HTMLTextFormControlElement::innerTextValue() is used.

NB: HTMLTextFormControlElement::value() should not be used because it
is updated asynchronously after text input.

Change-Id: I10eca4137236cfbef4c422cc935dd1c38a875301
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index a94b8c50a..3496083e2 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -680,7 +680,11 @@ EditorState WebPage::editorState() const
 
     // FIXME: We should only transfer innerText when it changes and do this on the UI side.
     if (result.isContentEditable && !result.isInPasswordField) {
-        result.surroundingText = scope->innerText();
+        if (isHTMLTextFormControlElement(scope))
+            result.surroundingText = toHTMLTextFormControlElement(scope)->innerTextValue();
+        else
+            result.surroundingText = scope->innerText();
+
         if (result.hasComposition) {
             // The anchor is always the left position when they represent a composition.
             result.surroundingText.remove(result.anchorPosition, result.cursorPosition - result.anchorPosition);