1 files changed, 15 insertions, 18 deletions

diff --git a/Source/WebCore/accessibility/AccessibilityScrollbar.h b/Source/WebCore/accessibility/AccessibilityScrollbar.h
index c086a4162..3cc431a0d 100644
--- a/Source/WebCore/accessibility/AccessibilityScrollbar.h
+++ b/Source/WebCore/accessibility/AccessibilityScrollbar.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 AccessibilityScrollbar_h
-#define AccessibilityScrollbar_h
+#pragma once
 
 #include "AccessibilityMockObject.h"
 
@@ -35,35 +34,33 @@ namespace WebCore {
 
 class Scrollbar;
 
-class AccessibilityScrollbar : public AccessibilityMockObject {
+class AccessibilityScrollbar final : public AccessibilityMockObject {
 public:
-    static PassRefPtr<AccessibilityScrollbar> create(Scrollbar*);
+    static Ref<AccessibilityScrollbar> create(Scrollbar*);
 
     Scrollbar* scrollbar() const { return m_scrollbar.get(); }
     
 private:
     explicit AccessibilityScrollbar(Scrollbar*);
 
-    virtual bool canSetValueAttribute() const override { return true; }
-    virtual bool canSetNumericValue() const override { return true; }
+    bool canSetValueAttribute() const override { return true; }
+    bool canSetNumericValue() const override { return true; }
 
-    virtual bool isAccessibilityScrollbar() const override { return true; }
-    virtual LayoutRect elementRect() const override;
+    bool isAccessibilityScrollbar() const override { return true; }
+    LayoutRect elementRect() const override;
     
-    virtual AccessibilityRole roleValue() const override { return ScrollBarRole; }
-    virtual AccessibilityOrientation orientation() const override;
-    virtual Document* document() const override;
-    virtual bool isEnabled() const override;
+    AccessibilityRole roleValue() const override { return ScrollBarRole; }
+    AccessibilityOrientation orientation() const override;
+    Document* document() const override;
+    bool isEnabled() const override;
     
     // Assumes float [0..1]
-    virtual void setValue(float) override;
-    virtual float valueForRange() const override;
+    void setValue(float) override;
+    float valueForRange() const override;
 
     RefPtr<Scrollbar> m_scrollbar;
 };
 
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityScrollbar, isAccessibilityScrollbar())
-
 } // namespace WebCore
 
-#endif // AccessibilityScrollbar_h
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityScrollbar, isAccessibilityScrollbar())