diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/rendering/TextControlInnerElements.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/rendering/TextControlInnerElements.h')
| -rw-r--r-- | Source/WebCore/rendering/TextControlInnerElements.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/TextControlInnerElements.h b/Source/WebCore/rendering/TextControlInnerElements.h index bb77dcd..4ba7857 100644 --- a/Source/WebCore/rendering/TextControlInnerElements.h +++ b/Source/WebCore/rendering/TextControlInnerElements.h @@ -48,8 +48,6 @@ protected: private: virtual bool isMouseFocusable() const { return false; } - - RefPtr<HTMLElement> m_shadowParent; }; class TextControlInnerTextElement : public TextControlInnerElement { @@ -101,6 +99,7 @@ public: private: SpinButtonElement(HTMLElement*); + virtual void detach(); virtual bool isSpinButtonElement() const { return true; } // FIXME: shadowAncestorNode() should be const. virtual bool isEnabledFormControl() const { return static_cast<Element*>(const_cast<SpinButtonElement*>(this)->shadowAncestorNode())->isEnabledFormControl(); } |