webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 11 insertions, 25 deletions

diff --git a/Source/WebCore/html/HTMLOptGroupElement.h b/Source/WebCore/html/HTMLOptGroupElement.h
index 1cb0493c5..6aa19c9f3 100644
--- a/Source/WebCore/html/HTMLOptGroupElement.h
+++ b/Source/WebCore/html/HTMLOptGroupElement.h
@@ -21,8 +21,7 @@
  *
  */
 
-#ifndef HTMLOptGroupElement_h
-#define HTMLOptGroupElement_h
+#pragma once
 
 #include "HTMLElement.h"
 
@@ -32,39 +31,26 @@ class HTMLSelectElement;
 
 class HTMLOptGroupElement final : public HTMLElement {
 public:
-    static PassRefPtr<HTMLOptGroupElement> create(const QualifiedName&, Document&);
+    static Ref<HTMLOptGroupElement> create(const QualifiedName&, Document&);
 
-    virtual bool isDisabledFormControl() const override;
+    bool isDisabledFormControl() const final;
     HTMLSelectElement* ownerSelectElement() const;
     
-    String groupLabelText() const;
+    WEBCORE_EXPORT String groupLabelText() const;
 
 private:
     HTMLOptGroupElement(const QualifiedName&, Document&);
 
-    virtual const AtomicString& formControlType() const;
-    virtual bool isFocusable() const override;
-    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
-    virtual bool rendererIsNeeded(const RenderStyle&) override { return false; }
-    virtual void didAttachRenderers() override;
-    virtual void willDetachRenderers() override;
+    const AtomicString& formControlType() const;
+    bool isFocusable() const final;
+    void parseAttribute(const QualifiedName&, const AtomicString&) final;
+    bool rendererIsNeeded(const RenderStyle&) final { return false; }
 
-    virtual void childrenChanged(const ChildChange&) override;
+    void childrenChanged(const ChildChange&) final;
 
-    virtual void accessKeyAction(bool sendMouseEvents) override;
-
-    // <optgroup> never has a renderer so we manually manage a cached style.
-    void updateNonRenderStyle();
-    virtual RenderStyle* nonRendererStyle() const override;
-    virtual PassRefPtr<RenderStyle> customStyleForRenderer() override;
+    void accessKeyAction(bool sendMouseEvents) final;
 
     void recalcSelectOptions();
-
-    RefPtr<RenderStyle> m_style;
 };
 
-NODE_TYPE_CASTS(HTMLOptGroupElement)
-
-} //namespace
-
-#endif
+} // namespace WebCore