commit e734fc1183192d3d91f9806fe7e6c5fe7b34bf56
author eric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed May 13 03:38:18 2009 +0000
committer eric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed May 13 03:38:18 2009 +0000
tree 931ebde8006fdcba3f8e647d1844394b24461bd4
parent 70f77ae57b3a6fad586db17895c767fd072c4e97

2009-05-11  Erik Arvidsson  <arv@chromium.org>

        Reviewed by Eric Seidel.

        Bug 21903: Adds DOM bindings for the placeholder property of the
        HTMLInputElement.
        https://bugs.webkit.org/show_bug.cgi?id=21903

        Test: fast/forms/placeholder-dom-property.html

        * dom/InputElement.cpp:
        (WebCore::InputElement::updatePlaceholderVisibility):
        * dom/InputElement.h:
        * html/HTMLInputElement.cpp:
        (WebCore::HTMLInputElement::placeholder):
        (WebCore::HTMLInputElement::setPlaceholder):
        * html/HTMLInputElement.h:
        * html/HTMLInputElement.idl:
        * rendering/RenderTextControlSingleLine.cpp:
        (WebCore::RenderTextControlSingleLine::updateFromElement):
        * wml/WMLInputElement.h:
        (WebCore::WMLInputElement::placeholder):
        (WebCore::WMLInputElement::setPlaceholder):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@43605 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/rendering/RenderTextControlSingleLine.cpp

diff --git a/WebCore/rendering/RenderTextControlSingleLine.cpp b/WebCore/rendering/RenderTextControlSingleLine.cpp
index 025956a..0330175 100644
--- a/WebCore/rendering/RenderTextControlSingleLine.cpp
+++ b/WebCore/rendering/RenderTextControlSingleLine.cpp
@@ -484,7 +484,7 @@
 
     if (m_placeholderVisible) {
         ExceptionCode ec = 0;
-        innerTextElement()->setInnerText(inputElement()->placeholderValue(), ec);
+        innerTextElement()->setInnerText(inputElement()->placeholder(), ec);
         ASSERT(!ec);
     } else if (!static_cast<Element*>(node())->formControlValueMatchesRenderer() || placeholderVisibilityShouldChange)
         setInnerTextValue(inputElement()->value());