Changeset 52204 in webkit

Timestamp:

Dec 16, 2009 10:43:27 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-16 Zelidrag Hornung <​zelidrag@chromium.org>

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=32261
Added ability to separate the autocomplete suggestion previewing from
the actual accepting of the suggested value in HTMLInputElement.
This element (it's single line text incarnation) can now
be put in suggestion mode where renderer might display the suggested
value without making it automatically exposed to JavaScript.

No new tests. This new methods are not exposed yet. It's use will be
platform specific. PopupMenu and Chromium specific changes will be
separated based on Darin Adler's comments.

• dom/InputElement.h: (WebCore::InputElementData::suggestedValue): (WebCore::InputElementData::setSuggestedValue):
• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::suggestedValue): (WebCore::HTMLInputElement::setSuggestedValue): (WebCore::HTMLInputElement::setValue): (WebCore::HTMLInputElement::setValueFromRenderer):
• html/HTMLInputElement.h:
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::updateFromElement):
• wml/WMLInputElement.cpp: (WebCore::WMLInputElement::suggestedValue):
• wml/WMLInputElement.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/InputElement.h (modified) (3 diffs)
• html/HTMLInputElement.cpp (modified) (3 diffs)
• html/HTMLInputElement.h (modified) (1 diff)
• rendering/RenderTextControlSingleLine.cpp (modified) (1 diff)
• wml/WMLInputElement.cpp (modified) (1 diff)
• wml/WMLInputElement.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-16  Zelidrag Hornung  <zelidrag@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32261
+        Added ability to separate the autocomplete suggestion previewing from
+        the actual accepting of the suggested value in HTMLInputElement.
+        This element (it's single line text incarnation) can now
+        be put in suggestion mode where renderer might display the suggested
+        value without making it automatically exposed to JavaScript.
+
+        No new tests. This new methods are not exposed yet. It's use will be
+        platform specific. PopupMenu and Chromium specific changes will be
+        separated based on Darin Adler's comments.
+
+        * dom/InputElement.h:
+        (WebCore::InputElementData::suggestedValue):
+        (WebCore::InputElementData::setSuggestedValue):
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::suggestedValue):
+        (WebCore::HTMLInputElement::setSuggestedValue):
+        (WebCore::HTMLInputElement::setValue):
+        (WebCore::HTMLInputElement::setValueFromRenderer):
+        * html/HTMLInputElement.h:
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::updateFromElement):
+        * wml/WMLInputElement.cpp:
+        (WebCore::WMLInputElement::suggestedValue):
+        * wml/WMLInputElement.h:
+
 2009-12-16  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/dom/InputElement.h

@@ -48 +48 @@
 
     virtual int size() const = 0;
+    virtual const String& suggestedValue() const = 0;
     virtual String value() const = 0;
     virtual void setValue(const String&, bool sendChangeEvent = false) = 0;
@@ -93 +94 @@
     void setValue(const String& value) { m_value = value; }
 
+    const String& suggestedValue() const { return m_suggestedValue; }
+    void setSuggestedValue(const String& value) { m_suggestedValue = value; }
+
     int size() const { return m_size; }
     void setSize(int value) { m_size = value; }
@@ -108 +112 @@
     AtomicString m_name;
     String m_value;
+    String m_suggestedValue;
     int m_size;
     int m_maxLength;

trunk/WebCore/html/HTMLInputElement.cpp

@@ -1314 +1314 @@
 }
 
+const String& HTMLInputElement::suggestedValue() const
+{
+    return m_data.suggestedValue();
+}
+
+void HTMLInputElement::setSuggestedValue(const String& value)
+{
+    if (inputType() != TEXT)
+        return;
+    setFormControlValueMatchesRenderer(false);
+    m_data.setSuggestedValue(sanitizeValue(value));
+    updatePlaceholderVisibility(false);
+    if (renderer())
+        renderer()->updateFromElement();
+    setNeedsStyleRecalc();
+}
+
 void HTMLInputElement::setValue(const String& value, bool sendChangeEvent)
 {
@@ -1346 +1363 @@
         else
             cacheSelection(max, max);
+        m_data.setSuggestedValue(String());
     }
 
@@ -1376 +1394 @@
     // File upload controls will always use setFileListFromRenderer.
     ASSERT(inputType() != FILE);
+    m_data.setSuggestedValue(String());
     updatePlaceholderVisibility(false);
     InputElement::setValueFromRenderer(m_data, this, this, value);

trunk/WebCore/html/HTMLInputElement.h

@@ -138 +138 @@
     void setType(const String&);
 
+    virtual const String& suggestedValue() const;
+    void setSuggestedValue(const String&);
+
     virtual String value() const;
     virtual void setValue(const String&, bool sendChangeEvent = false);

trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -462 +462 @@
         innerTextElement()->setInnerText(static_cast<Element*>(node())->getAttribute(placeholderAttr), ec);
         ASSERT(!ec);
-    } else
-        setInnerTextValue(inputElement()->value());
+    } else {
+        if (!inputElement()->suggestedValue().isNull())
+            setInnerTextValue(inputElement()->suggestedValue());
+        else
+            setInnerTextValue(inputElement()->value());
+    }
 
     if (m_searchPopupIsVisible)

trunk/WebCore/wml/WMLInputElement.cpp

@@ -122 +122 @@
 {
     return m_data.name();
+}
+
+const String& WMLInputElement::suggestedValue() const
+{
+    return m_data.suggestedValue();
 }
 

trunk/WebCore/wml/WMLInputElement.h

@@ -57 +57 @@
     virtual const AtomicString& formControlType() const;
     virtual const AtomicString& formControlName() const;
+    virtual const String& suggestedValue() const;
     virtual String value() const;
     virtual void setValue(const String&, bool sendChangeEvent = false);