Merge FrameView and ScrollView.

Source/core/accessibility/AXObjectCache.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010, 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 20 matching lines @@
 #include "platform/Timer.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 class AbstractInlineTextBox;
 class HTMLAreaElement;
-class ScrollView;
+class FrameView;
 class Widget;
 
 struct TextMarkerData {
     AXID axID;
     Node* node;
     int offset;
     EAffinity affinity;
 };
 
 class AXComputedObjectAttributeCache {
@@ skipping 68 matching lines @@
     // Called when a node has just been attached, so we can make sure we have the right subclass of AXObject.
     void updateCacheAfterNodeIsAttached(Node*);
 
     void handleActiveDescendantChanged(Node*);
     void handleAriaRoleChanged(Node*);
     void handleFocusedUIElementChanged(Node* oldFocusedNode, Node* newFocusedNode);
     void handleScrolledToAnchor(const Node* anchorNode);
     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*);
     void recomputeIsIgnored(RenderObject* renderer);
 
     void inlineTextBoxesUpdated(RenderObject* renderer);
 
     bool accessibilityEnabled();
     bool inlineTextBoxAccessibilityEnabled();
 
@@ skipping 81 matching lines @@
     Settings* settings();
 };
 
 bool nodeHasRole(Node*, const String& role);
 // This will let you know if aria-hidden was explicitly set to false.
 bool isNodeAriaVisible(Node*);
 
 }
 
 #endif