Merge FrameView and ScrollView.

Source/core/accessibility/AXObjectCache.h

Index: Source/core/accessibility/AXObjectCache.h
diff --git a/Source/core/accessibility/AXObjectCache.h b/Source/core/accessibility/AXObjectCache.h
index f7cf20acc5cb43f8703afe5e8955efe0bf921dcb..c4083a167ddc3d1e24e7961b13e9574ab600037c 100644
--- a/Source/core/accessibility/AXObjectCache.h
+++ b/Source/core/accessibility/AXObjectCache.h
@@ -38,7 +38,7 @@ namespace blink {
 
 class AbstractInlineTextBox;
 class HTMLAreaElement;
-class ScrollView;
+class FrameView;
 class Widget;
 
 struct TextMarkerData {
@@ -127,12 +127,12 @@ public:
     void handleAriaExpandedChange(Node*);
 
     // Called when scroll bars are added / removed (as the view resizes).
-    void handleScrollbarUpdate(ScrollView*);
+    void handleScrollbarUpdate(FrameView*);
 
     void handleLayoutComplete(RenderObject*);
 
     // Called when the scroll offset changes.
-    void handleScrollPositionChanged(ScrollView*);
+    void handleScrollPositionChanged(FrameView*);
     void handleScrollPositionChanged(RenderObject*);
 
     void handleAttributeChanged(const QualifiedName& attrName, Element*);