1 files changed, 19 insertions, 22 deletions
diff --git a/Source/WebCore/accessibility/AccessibilitySpinButton.h b/Source/WebCore/accessibility/AccessibilitySpinButton.h
index c3956954f..bc043be85 100644
--- a/Source/WebCore/accessibility/AccessibilitySpinButton.h
+++ b/Source/WebCore/accessibility/AccessibilitySpinButton.h
@@ -23,18 +23,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AccessibilitySpinButton_h
-#define AccessibilitySpinButton_h
+#pragma once
 
 #include "AccessibilityMockObject.h"
-
 #include "SpinButtonElement.h"
 
 namespace WebCore {
     
-class AccessibilitySpinButton : public AccessibilityMockObject {
+class AccessibilitySpinButton final : public AccessibilityMockObject {
 public:
-    static PassRefPtr<AccessibilitySpinButton> create();
+    static Ref<AccessibilitySpinButton> create();
     virtual ~AccessibilitySpinButton();
     
     void setSpinButtonElement(SpinButtonElement* spinButton) { m_spinButtonElement = spinButton; }
@@ -47,18 +45,18 @@ public:
 private:
     AccessibilitySpinButton();
 
-    virtual AccessibilityRole roleValue() const override { return SpinButtonRole; }
-    virtual bool isSpinButton() const override { return true; }
-    virtual bool isNativeSpinButton() const override { return true; }
-    virtual void addChildren() override;
-    virtual LayoutRect elementRect() const override;
+    AccessibilityRole roleValue() const override { return SpinButtonRole; }
+    bool isSpinButton() const override { return true; }
+    bool isNativeSpinButton() const override { return true; }
+    void addChildren() override;
+    LayoutRect elementRect() const override;
     
     SpinButtonElement* m_spinButtonElement;
 }; 
    
-class AccessibilitySpinButtonPart : public AccessibilityMockObject {
+class AccessibilitySpinButtonPart final : public AccessibilityMockObject {
 public:
-    static PassRefPtr<AccessibilitySpinButtonPart> create();
+    static Ref<AccessibilitySpinButtonPart> create();
     virtual ~AccessibilitySpinButtonPart() { }
     
     bool isIncrementor() const { return m_isIncrementor; }
@@ -66,17 +64,16 @@ public:
     
 private:
     AccessibilitySpinButtonPart();
-    bool m_isIncrementor : 1;
     
-    virtual bool press() const override;
-    virtual AccessibilityRole roleValue() const override { return ButtonRole; }
-    virtual bool isSpinButtonPart() const override { return true; }
-    virtual LayoutRect elementRect() const override;
-};
+    bool press() override;
+    AccessibilityRole roleValue() const override { return ButtonRole; }
+    bool isSpinButtonPart() const override { return true; }
+    LayoutRect elementRect() const override;
 
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilitySpinButton, isNativeSpinButton())
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilitySpinButtonPart, isSpinButtonPart())
+    unsigned m_isIncrementor : 1;
+};
     
-} // namespace WebCore 
+} // namespace WebCore
 
-#endif // AccessibilitySpinButton_h
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilitySpinButton, isNativeSpinButton())
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilitySpinButtonPart, isSpinButtonPart())