Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / HTMLTextAreaElement.cpp

diff --git a/src/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp b/src/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp
index ce8bafa..7ea7aa6 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp
+++ b/src/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp
@@ -260,7 +260,7 @@ void HTMLTextAreaElement::defaultEventHandler(Event* event)
     HTMLTextFormControlElement::defaultEventHandler(event);
 }
 
-void HTMLTextAreaElement::handleFocusEvent(Element*, FocusDirection)
+void HTMLTextAreaElement::handleFocusEvent(Element*, FocusType)
 {
     if (Frame* frame = document().frame())
         frame->spellChecker().didBeginEditing(this);
@@ -362,8 +362,9 @@ void HTMLTextAreaElement::setValueCommon(const String& newValue)
     setInnerTextValue(m_value);
     setLastChangeWasNotUserEdit();
     updatePlaceholderVisibility(false);
-    setNeedsStyleRecalc();
+    setNeedsStyleRecalc(SubtreeStyleChange);
     setFormControlValueMatchesRenderer(true);
+    m_suggestedValue = String();
 
     // Set the caret to the end of the text value.
     if (document().focusedElement() == this) {
@@ -438,7 +439,7 @@ void HTMLTextAreaElement::setSuggestedValue(const String& value)
     m_suggestedValue = value;
     setInnerTextValue(m_suggestedValue);
     updatePlaceholderVisibility(false);
-    setNeedsStyleRecalc();
+    setNeedsStyleRecalc(SubtreeStyleChange);
     setFormControlValueMatchesRenderer(true);
 }