webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 29 insertions, 33 deletions

diff --git a/Source/WebCore/accessibility/AccessibilityScrollView.h b/Source/WebCore/accessibility/AccessibilityScrollView.h
index 56be1a07e..0d76f664a 100644
--- a/Source/WebCore/accessibility/AccessibilityScrollView.h
+++ b/Source/WebCore/accessibility/AccessibilityScrollView.h
@@ -23,8 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AccessibilityScrollView_h
-#define AccessibilityScrollView_h
+#pragma once
 
 #include "AccessibilityObject.h"
 
@@ -34,47 +33,46 @@ class AccessibilityScrollbar;
 class Scrollbar;
 class ScrollView;
     
-class AccessibilityScrollView : public AccessibilityObject {
+class AccessibilityScrollView final : public AccessibilityObject {
 public:
-    static PassRefPtr<AccessibilityScrollView> create(ScrollView*);    
-    virtual AccessibilityRole roleValue() const override { return ScrollAreaRole; }
+    static Ref<AccessibilityScrollView> create(ScrollView*);
+    AccessibilityRole roleValue() const override { return ScrollAreaRole; }
     ScrollView* scrollView() const { return m_scrollView; }
 
     virtual ~AccessibilityScrollView();
-    virtual void detach(AccessibilityDetachmentType, AXObjectCache*) override;
+    void detach(AccessibilityDetachmentType, AXObjectCache*) override;
+
+    AccessibilityObject* webAreaObject() const;
 
-protected:
-    virtual ScrollableArea* getScrollableAreaIfScrollable() const override;
-    virtual void scrollTo(const IntPoint&) const override;
-    
 private:
     explicit AccessibilityScrollView(ScrollView*);
     
-    virtual bool computeAccessibilityIsIgnored() const override;
-    virtual bool isAccessibilityScrollView() const override { return true; }
-    virtual bool isEnabled() const override { return true; }
+    ScrollableArea* getScrollableAreaIfScrollable() const override;
+    void scrollTo(const IntPoint&) const override;
+    bool computeAccessibilityIsIgnored() const override;
+    bool isAccessibilityScrollView() const override { return true; }
+    bool isEnabled() const override { return true; }
     
-    virtual bool isAttachment() const override;
-    virtual Widget* widgetForAttachmentView() const override;
+    bool isAttachment() const override;
+    Widget* widgetForAttachmentView() const override;
     
-    virtual AccessibilityObject* scrollBar(AccessibilityOrientation) override;
-    virtual void addChildren() override;
-    virtual void clearChildren() override;
-    virtual AccessibilityObject* accessibilityHitTest(const IntPoint&) const override;
-    virtual void updateChildrenIfNecessary() override;
-    virtual void setNeedsToUpdateChildren() override { m_childrenDirty = true; }
+    AccessibilityObject* scrollBar(AccessibilityOrientation) override;
+    void addChildren() override;
+    void clearChildren() override;
+    AccessibilityObject* accessibilityHitTest(const IntPoint&) const override;
+    void updateChildrenIfNecessary() override;
+    void setNeedsToUpdateChildren() override { m_childrenDirty = true; }
     void updateScrollbars();
-    virtual void setFocused(bool) override;
-    virtual bool canSetFocusAttribute() const override;
-    virtual bool isFocused() const override;
+    void setFocused(bool) override;
+    bool canSetFocusAttribute() const override;
+    bool isFocused() const override;
     
-    virtual FrameView* documentFrameView() const override;
-    virtual LayoutRect elementRect() const override;
-    virtual AccessibilityObject* parentObject() const override;
-    virtual AccessibilityObject* parentObjectIfExists() const override;
+    FrameView* documentFrameView() const override;
+    LayoutRect elementRect() const override;
+    AccessibilityObject* parentObject() const override;
+    AccessibilityObject* parentObjectIfExists() const override;
     
-    AccessibilityObject* webAreaObject() const;
-    virtual AccessibilityObject* firstChild() const override { return webAreaObject(); }
+    AccessibilityObject* firstChild() const override { return webAreaObject(); }
     AccessibilityScrollbar* addChildScrollbar(Scrollbar*);
     void removeChildScrollbar(AccessibilityObject*);
     
@@ -83,9 +81,7 @@ private:
     RefPtr<AccessibilityObject> m_verticalScrollbar;
     bool m_childrenDirty;
 };
-
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityScrollView, isAccessibilityScrollView())
     
 } // namespace WebCore
 
-#endif // AccessibilityScrollView_h
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityScrollView, isAccessibilityScrollView())