diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-01-11 10:13:50 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-01-11 10:13:50 -0500 |
| commit | 7c1b3b8c573eed35ddc15fd7dd3d762403f30755 (patch) | |
| tree | 0b9adcea438a16aacec2aa7990716b331b58a9cd /WebKit/android/nav/CachedInput.h | |
| parent | 201cb71276abda07e3ac4e0bf8bc1f8966a24757 (diff) | |
| parent | 9653e7ce8a33c5e4b2931a3594e82c49597601e2 (diff) | |
| download | external_webkit-7c1b3b8c573eed35ddc15fd7dd3d762403f30755.zip external_webkit-7c1b3b8c573eed35ddc15fd7dd3d762403f30755.tar.gz external_webkit-7c1b3b8c573eed35ddc15fd7dd3d762403f30755.tar.bz2 | |
resolved conflicts for merge of 9653e7ce to master
Diffstat (limited to 'WebKit/android/nav/CachedInput.h')
| -rw-r--r-- | WebKit/android/nav/CachedInput.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebKit/android/nav/CachedInput.h b/WebKit/android/nav/CachedInput.h index f3cf1fe..42cadf1 100644 --- a/WebKit/android/nav/CachedInput.h +++ b/WebKit/android/nav/CachedInput.h @@ -44,14 +44,12 @@ public: mName = WebCore::String(); } WebCore::HTMLInputElement::InputType inputType() const { return mInputType; } - bool isReadOnly() const { return mIsReadOnly; } bool isRtlText() const { return mIsRtlText; } bool isTextField() const { return mIsTextField; } int maxLength() const { return mMaxLength; }; const WebCore::String& name() const { return mName; } void setFormPointer(void* form) { mForm = form; } void setInputType(WebCore::HTMLInputElement::InputType type) { mInputType = type; } - void setIsReadOnly(bool isReadOnly) { mIsReadOnly = isReadOnly; } void setIsRtlText(bool isRtlText) { mIsRtlText = isRtlText; } void setIsTextField(bool isTextField) { mIsTextField = isTextField; } void setMaxLength(int maxLength) { mMaxLength = maxLength; } @@ -64,7 +62,6 @@ private: int mMaxLength; int mTextSize; WebCore::HTMLInputElement::InputType mInputType; - bool mIsReadOnly : 1; bool mIsRtlText : 1; bool mIsTextField : 1; #if DUMP_NAV_CACHE |