1 files changed, 10 insertions, 9 deletions
diff --git a/WebCore/html/HTMLOptionElement.h b/WebCore/html/HTMLOptionElement.h
index 635a7b3..58426eb 100644
--- a/WebCore/html/HTMLOptionElement.h
+++ b/WebCore/html/HTMLOptionElement.h
@@ -25,7 +25,7 @@
 #ifndef HTMLOptionElement_h
 #define HTMLOptionElement_h
 
-#include "HTMLGenericFormElement.h"
+#include "HTMLFormControlElement.h"
 
 namespace WebCore {
 
@@ -33,8 +33,7 @@ class HTMLSelectElement;
 class HTMLFormElement;
 class MappedAttribute;
 
-class HTMLOptionElement : public HTMLGenericFormElement
-{
+class HTMLOptionElement : public HTMLFormControlElement {
     friend class HTMLSelectElement;
     friend class RenderMenuList;
 
@@ -48,8 +47,7 @@ public:
     virtual bool rendererIsNeeded(RenderStyle*) { return false; }
     virtual void attach();
     virtual void detach();
-    virtual RenderStyle* renderStyle() const { return m_style; }
-    virtual void setRenderStyle(RenderStyle*);
+    virtual void setRenderStyle(PassRefPtr<RenderStyle>);
     
     virtual const AtomicString& type() const;
 
@@ -66,9 +64,9 @@ public:
     void setSelected(bool);
     void setSelectedState(bool);
 
-    HTMLSelectElement* getSelect() const;
+    HTMLSelectElement* ownerSelectElement() const;
 
-    virtual void childrenChanged(bool changedByParser = false);
+    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
 
     bool defaultSelected() const;
     void setDefaultSelected(bool);
@@ -81,11 +79,14 @@ public:
     virtual bool disabled() const;
     
     virtual void insertedIntoDocument();
-
+    virtual void accessKeyAction(bool);
+    
 private:
+    virtual RenderStyle* nonRendererRenderStyle() const;
+    
     String m_value;
     bool m_selected;
-    RenderStyle* m_style;
+    RefPtr<RenderStyle> m_style;
 };
 
 } //namespace