1 files changed, 22 insertions, 29 deletions

diff --git a/Source/WebCore/accessibility/AccessibilitySlider.h b/Source/WebCore/accessibility/AccessibilitySlider.h
index d9529903d..4b20f7939 100644
--- a/Source/WebCore/accessibility/AccessibilitySlider.h
+++ b/Source/WebCore/accessibility/AccessibilitySlider.h
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -26,8 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AccessibilitySlider_h
-#define AccessibilitySlider_h
+#pragma once
 
 #include "AccessibilityMockObject.h"
 #include "AccessibilityRenderObject.h"
@@ -37,9 +36,8 @@ namespace WebCore {
 class HTMLInputElement;
 
 class AccessibilitySlider : public AccessibilityRenderObject {
-    
 public:
-    static PassRefPtr<AccessibilitySlider> create(RenderObject*);
+    static Ref<AccessibilitySlider> create(RenderObject*);
     virtual ~AccessibilitySlider() { }
 
 protected:
@@ -47,45 +45,40 @@ protected:
 
 private:
     HTMLInputElement* inputElement() const;
-    virtual AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const override;
+    AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const override;
 
-    virtual AccessibilityRole roleValue() const override { return SliderRole; }
-    virtual bool isSlider() const override { return true; }
-    virtual bool isInputSlider() const override { return true; }
-    virtual bool isControl() const override { return true; }
+    AccessibilityRole roleValue() const override { return SliderRole; }
+    bool isSlider() const final { return true; }
+    bool isInputSlider() const override { return true; }
+    bool isControl() const override { return true; }
     
-    virtual void addChildren() override;
+    void addChildren() override;
     
-    virtual bool canSetValueAttribute() const override { return true; }
+    bool canSetValueAttribute() const override { return true; }
     const AtomicString& getAttribute(const QualifiedName& attribute) const;
     
-    virtual void setValue(const String&) override;
-    virtual float valueForRange() const override;
-    virtual float maxValueForRange() const override;
-    virtual float minValueForRange() const override;
-    virtual AccessibilityOrientation orientation() const override;
+    void setValue(const String&) override;
+    float valueForRange() const override;
+    float maxValueForRange() const override;
+    float minValueForRange() const override;
+    AccessibilityOrientation orientation() const override;
 };
 
-class AccessibilitySliderThumb : public AccessibilityMockObject {
-    
+class AccessibilitySliderThumb final : public AccessibilityMockObject {
 public:
-    static PassRefPtr<AccessibilitySliderThumb> create();
+    static Ref<AccessibilitySliderThumb> create();
     virtual ~AccessibilitySliderThumb() { }
 
-    virtual bool isSliderThumb() const override final { return true; }
-
-    virtual AccessibilityRole roleValue() const override { return SliderThumbRole; }
-
-    virtual LayoutRect elementRect() const override;
+    AccessibilityRole roleValue() const override { return SliderThumbRole; }
+    LayoutRect elementRect() const override;
 
 private:
     AccessibilitySliderThumb();
 
-    virtual bool computeAccessibilityIsIgnored() const override;
+    bool isSliderThumb() const override { return true; }
+    bool computeAccessibilityIsIgnored() const override;
 };
 
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilitySliderThumb, isSliderThumb())
-
 } // namespace WebCore
 
-#endif // AccessibilitySlider_h
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilitySliderThumb, isSliderThumb())