Index: Source/WebCore/html/HTMLOptionElement.h |
diff --git a/Source/WebCore/html/HTMLOptionElement.h b/Source/WebCore/html/HTMLOptionElement.h |
index 673f077f322acf67af739a5b662d708ad854c930..32eab2aa7d26b1221f0a916fc6313328f6e80329 100644 |
--- a/Source/WebCore/html/HTMLOptionElement.h |
+++ b/Source/WebCore/html/HTMLOptionElement.h |
@@ -61,6 +61,7 @@ public: |
bool ownElementDisabled() const { return m_disabled; } |
virtual bool isDisabledFormControl() const OVERRIDE; |
+ virtual PassRefPtr<RenderStyle> customStyleForRenderer() OVERRIDE; |
String textIndentedToRespectGroupLabel() const; |
@@ -71,9 +72,6 @@ private: |
virtual bool supportsFocus() const; |
virtual bool isFocusable() const; |
- virtual bool rendererIsNeeded(const NodeRenderingContext&) { return false; } |
- virtual void attach(); |
- virtual void detach(); |
virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE; |
@@ -82,18 +80,11 @@ private: |
virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0); |
- // <option> never has a renderer so we manually manage a cached style. |
- void updateNonRenderStyle(); |
- virtual RenderStyle* nonRendererStyle() const OVERRIDE; |
- virtual PassRefPtr<RenderStyle> customStyleForRenderer() OVERRIDE; |
- |
- void didRecalcStyle(StyleChange) OVERRIDE; |
- |
String collectOptionInnerText() const; |
+ void updateLabel(); |
bool m_disabled; |
bool m_isSelected; |
- RefPtr<RenderStyle> m_style; |
}; |
HTMLOptionElement* toHTMLOptionElement(Node*); |