diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 16:53:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 10:24:15 +0100 |
| commit | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch) | |
| tree | f7111b9b22befab472616c1d50ec94eb50f1ec8c /WebCore/rendering/RenderTextControlMultiLine.cpp | |
| parent | a149172322a9067c14e8b474a53e63649aa17cad (diff) | |
| download | external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2 | |
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'WebCore/rendering/RenderTextControlMultiLine.cpp')
| -rw-r--r-- | WebCore/rendering/RenderTextControlMultiLine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderTextControlMultiLine.cpp b/WebCore/rendering/RenderTextControlMultiLine.cpp index 9fbde3a..76bf612 100644 --- a/WebCore/rendering/RenderTextControlMultiLine.cpp +++ b/WebCore/rendering/RenderTextControlMultiLine.cpp @@ -114,7 +114,7 @@ void RenderTextControlMultiLine::updateFromElement() HTMLTextAreaElement* textArea = static_cast<HTMLTextAreaElement*>(node()); if (m_placeholderVisible) - setInnerTextValue(textArea->getAttribute(HTMLNames::placeholderAttr)); + setInnerTextValue(textArea->strippedPlaceholder()); else setInnerTextValue(textArea->value()); } |