diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
| tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebCore/rendering/RenderTextControlSingleLine.h | |
| parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
| download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 | |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebCore/rendering/RenderTextControlSingleLine.h')
| -rw-r--r-- | WebCore/rendering/RenderTextControlSingleLine.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderTextControlSingleLine.h b/WebCore/rendering/RenderTextControlSingleLine.h index 0deb063..26987fd 100644 --- a/WebCore/rendering/RenderTextControlSingleLine.h +++ b/WebCore/rendering/RenderTextControlSingleLine.h @@ -143,6 +143,9 @@ private: InputElement* inputElement() const; + virtual int textBlockInsetLeft() const; + virtual int textBlockInsetRight() const; + bool m_searchPopupIsVisible; bool m_shouldDrawCapsLockIndicator; @@ -161,7 +164,7 @@ private: }; inline RenderTextControlSingleLine* toRenderTextControlSingleLine(RenderObject* object) -{ +{ ASSERT(!object || object->isTextField()); return static_cast<RenderTextControlSingleLine*>(object); } |