webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 14 insertions, 19 deletions

diff --git a/Source/WebCore/accessibility/AccessibilityMenuListPopup.h b/Source/WebCore/accessibility/AccessibilityMenuListPopup.h
index 9e20933e3..c1987cd3a 100644
--- a/Source/WebCore/accessibility/AccessibilityMenuListPopup.h
+++ b/Source/WebCore/accessibility/AccessibilityMenuListPopup.h
@@ -23,8 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef AccessibilityMenuListPopup_h
-#define AccessibilityMenuListPopup_h
+#pragma once
 
 #include "AccessibilityMockObject.h"
 
@@ -33,37 +32,33 @@ namespace WebCore {
 class AccessibilityMenuList;
 class AccessibilityMenuListOption;
 class HTMLElement;
-class HTMLSelectElement;
 
-class AccessibilityMenuListPopup : public AccessibilityMockObject {
+class AccessibilityMenuListPopup final : public AccessibilityMockObject {
 public:
-    static PassRefPtr<AccessibilityMenuListPopup> create() { return adoptRef(new AccessibilityMenuListPopup); }
+    static Ref<AccessibilityMenuListPopup> create() { return adoptRef(*new AccessibilityMenuListPopup); }
 
-    virtual bool isEnabled() const override;
-    virtual bool isOffScreen() const override;
+    bool isEnabled() const override;
+    bool isOffScreen() const override;
 
     void didUpdateActiveOption(int optionIndex);
 
-
 private:
     AccessibilityMenuListPopup();
 
-    virtual bool isMenuListPopup() const override { return true; }
+    bool isMenuListPopup() const override { return true; }
 
-    virtual LayoutRect elementRect() const override { return LayoutRect(); }
-    virtual AccessibilityRole roleValue() const override { return MenuListPopupRole; }
+    LayoutRect elementRect() const override { return LayoutRect(); }
+    AccessibilityRole roleValue() const override { return MenuListPopupRole; }
 
-    virtual bool isVisible() const override;
-    virtual bool press() const override;
-    virtual void addChildren() override;
-    virtual void childrenChanged() override;
-    virtual bool computeAccessibilityIsIgnored() const override;
+    bool isVisible() const override;
+    bool press() override;
+    void addChildren() override;
+    void childrenChanged() override;
+    bool computeAccessibilityIsIgnored() const override;
 
     AccessibilityMenuListOption* menuListOptionAccessibilityObject(HTMLElement*) const;
 };
 
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityMenuListPopup, isMenuListPopup())
-
 } // namespace WebCore
 
-#endif // AccessibilityMenuListPopup_h
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityMenuListPopup, isMenuListPopup())