Merge FrameView and ScrollView.

Source/core/accessibility/AXScrollView.h

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 14 matching lines @@
 
 #ifndef AXScrollView_h
 #define AXScrollView_h
 
 #include "core/accessibility/AXObject.h"
 
 namespace blink {
 
 class AXScrollbar;
 class Scrollbar;
-class ScrollView;
+class FrameView;
 
 class AXScrollView final : public AXObject {
 public:
-    static PassRefPtr<AXScrollView> create(ScrollView*);
+    static PassRefPtr<AXScrollView> create(FrameView*);
     virtual AccessibilityRole roleValue() const override { return ScrollAreaRole; }
-    ScrollView* scrollView() const { return m_scrollView; }
+    FrameView* scrollView() const { return m_scrollView; }
 
     virtual ~AXScrollView();
     virtual void detach() override;
 
 protected:
     virtual ScrollableArea* getScrollableAreaIfScrollable() const override;
     virtual void scrollTo(const IntPoint&) const override;
 
 private:
-    explicit AXScrollView(ScrollView*);
+    explicit AXScrollView(FrameView*);
 
     virtual bool computeAccessibilityIsIgnored() const override;
     virtual bool isAXScrollView() const override { return true; }
     virtual bool isEnabled() const override { return true; }
 
     virtual bool isAttachment() const override;
     virtual Widget* widgetForAttachmentView() const override;
 
     virtual AXObject* scrollBar(AccessibilityOrientation) override;
     virtual void addChildren() override;
     virtual void clearChildren() override;
     virtual AXObject* accessibilityHitTest(const IntPoint&) const override;
     virtual void updateChildrenIfNecessary() override;
     virtual void setNeedsToUpdateChildren() override { m_childrenDirty = true; }
     void updateScrollbars();
 
     virtual FrameView* documentFrameView() const override;
     virtual LayoutRect elementRect() const override;
     virtual AXObject* parentObject() const override;
     virtual AXObject* parentObjectIfExists() const override;
 
     AXObject* webAreaObject() const;
     virtual AXObject* firstChild() const override { return webAreaObject(); }
     AXScrollbar* addChildScrollbar(Scrollbar*);
     void removeChildScrollbar(AXObject*);
 
-    ScrollView* m_scrollView;
+    FrameView* m_scrollView;
     RefPtr<AXObject> m_horizontalScrollbar;
     RefPtr<AXObject> m_verticalScrollbar;
     bool m_childrenDirty;
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXScrollView, isAXScrollView());
 
 } // namespace blink
 
 #endif // AXScrollView_h