diff options
author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/rendering/RenderTextControlSingleLine.h | |
parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/rendering/RenderTextControlSingleLine.h')
-rw-r--r-- | WebCore/rendering/RenderTextControlSingleLine.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderTextControlSingleLine.h b/WebCore/rendering/RenderTextControlSingleLine.h index ab9f711..92ecadd 100644 --- a/WebCore/rendering/RenderTextControlSingleLine.h +++ b/WebCore/rendering/RenderTextControlSingleLine.h @@ -98,6 +98,7 @@ private: PassRefPtr<RenderStyle> createInnerBlockStyle(const RenderStyle* startStyle) const; PassRefPtr<RenderStyle> createResultsButtonStyle(const RenderStyle* startStyle) const; PassRefPtr<RenderStyle> createCancelButtonStyle(const RenderStyle* startStyle) const; + PassRefPtr<RenderStyle> createInnerSpinButtonStyle() const; PassRefPtr<RenderStyle> createOuterSpinButtonStyle() const; #if ENABLE(INPUT_SPEECH) PassRefPtr<RenderStyle> createSpeechButtonStyle(const RenderStyle* startStyle) const; @@ -115,6 +116,7 @@ private: virtual void selectionChanged(unsigned, bool) {} virtual void selectionCleared() {} virtual String itemText(unsigned listIndex) const; + virtual String itemLabel(unsigned listIndex) const; virtual String itemToolTip(unsigned) const { return String(); } virtual String itemAccessibilityText(unsigned) const { return String(); } virtual bool itemIsEnabled(unsigned listIndex) const; @@ -145,6 +147,7 @@ private: RefPtr<TextControlInnerElement> m_innerBlock; RefPtr<SearchFieldResultsButtonElement> m_resultsButton; RefPtr<SearchFieldCancelButtonElement> m_cancelButton; + RefPtr<TextControlInnerElement> m_innerSpinButton; RefPtr<TextControlInnerElement> m_outerSpinButton; #if ENABLE(INPUT_SPEECH) RefPtr<InputFieldSpeechButtonElement> m_speechButton; |