webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 18 insertions, 22 deletions

diff --git a/Source/WebCore/accessibility/AccessibilityMenuListOption.h b/Source/WebCore/accessibility/AccessibilityMenuListOption.h
index 6bee58b18..4111e07b9 100644
--- a/Source/WebCore/accessibility/AccessibilityMenuListOption.h
+++ b/Source/WebCore/accessibility/AccessibilityMenuListOption.h
@@ -23,47 +23,43 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef AccessibilityMenuListOption_h
-#define AccessibilityMenuListOption_h
+#pragma once
 
 #include "AccessibilityMockObject.h"
 
 namespace WebCore {
 
-class AccessibilityMenuListPopup;
 class HTMLElement;
 
-class AccessibilityMenuListOption : public AccessibilityMockObject {
+class AccessibilityMenuListOption final : public AccessibilityMockObject {
 public:
-    static PassRefPtr<AccessibilityMenuListOption> create() { return adoptRef(new AccessibilityMenuListOption); }
+    static Ref<AccessibilityMenuListOption> create() { return adoptRef(*new AccessibilityMenuListOption); }
 
     void setElement(HTMLElement*);
 
 private:
     AccessibilityMenuListOption();
 
-    virtual bool isMenuListOption() const override { return true; }
+    bool isMenuListOption() const override { return true; }
 
-    virtual AccessibilityRole roleValue() const override { return MenuListOptionRole; }
-    virtual bool canHaveChildren() const override { return false; }
+    AccessibilityRole roleValue() const override { return MenuListOptionRole; }
+    bool canHaveChildren() const override { return false; }
 
-    virtual Element* actionElement() const override;
-    virtual bool isEnabled() const override;
-    virtual bool isVisible() const override;
-    virtual bool isOffScreen() const override;
-    virtual bool isSelected() const override;
-    virtual String nameForMSAA() const override;
-    virtual void setSelected(bool) override;
-    virtual bool canSetSelectedAttribute() const override;
-    virtual LayoutRect elementRect() const override;
-    virtual String stringValue() const override;
-    virtual bool computeAccessibilityIsIgnored() const override;
+    Element* actionElement() const override;
+    bool isEnabled() const override;
+    bool isVisible() const override;
+    bool isOffScreen() const override;
+    bool isSelected() const override;
+    String nameForMSAA() const override;
+    void setSelected(bool) override;
+    bool canSetSelectedAttribute() const override;
+    LayoutRect elementRect() const override;
+    String stringValue() const override;
+    bool computeAccessibilityIsIgnored() const override;
 
     RefPtr<HTMLElement> m_element;
 };
 
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityMenuListOption, isMenuListOption())
-
 } // namespace WebCore
 
-#endif // AccessibilityMenuListOption_h
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityMenuListOption, isMenuListOption())