Merge FrameView and ScrollView.

Source/core/accessibility/AXObjectCache.cpp

 /*
  * Copyright (C) 2008, 2009, 2010 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 38 matching lines @@
 #include "core/accessibility/AXScrollView.h"
 #include "core/accessibility/AXScrollbar.h"
 #include "core/accessibility/AXSlider.h"
 #include "core/accessibility/AXSpinButton.h"
 #include "core/accessibility/AXTable.h"
 #include "core/accessibility/AXTableCell.h"
 #include "core/accessibility/AXTableColumn.h"
 #include "core/accessibility/AXTableHeaderContainer.h"
 #include "core/accessibility/AXTableRow.h"
 #include "core/dom/Document.h"
+#include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLAreaElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLLabelElement.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/rendering/AbstractInlineTextBox.h"
 #include "core/rendering/RenderListBox.h"
 #include "core/rendering/RenderMenuList.h"
 #include "core/rendering/RenderProgress.h"
 #include "core/rendering/RenderSlider.h"
 #include "core/rendering/RenderTable.h"
 #include "core/rendering/RenderTableCell.h"
 #include "core/rendering/RenderTableRow.h"
 #include "core/rendering/RenderView.h"
-#include "platform/scroll/ScrollView.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 AXObjectInclusion AXComputedObjectAttributeCache::getIgnored(AXID id) const
 {
     HashMap<AXID, CachedAXObjectAttributes>::const_iterator it = m_idMapping.find(id);
     return it != m_idMapping.end() ? it->value.ignored : DefaultBehavior;
@@ skipping 245 matching lines @@
 AXObject* AXObjectCache::getOrCreate(Widget* widget)
 {
     if (!widget)
         return 0;
 
     if (AXObject* obj = get(widget))
         return obj;
 
     RefPtr<AXObject> newObj = nullptr;
     if (widget->isFrameView())
-        newObj = AXScrollView::create(toScrollView(widget));
+        newObj = AXScrollView::create(toFrameView(widget));
     else if (widget->isScrollbar())
         newObj = AXScrollbar::create(toScrollbar(widget));
 
     // Will crash later if we have two objects for the same widget.
     ASSERT(!get(widget));
 
     // Catch the case if an (unsupported) widget type is used. Only FrameView and ScrollBar are supported now.
     ASSERT(newObj);
     if (!newObj)
         return 0;
@@ skipping 444 matching lines @@
     postNotification(node, AXSelectedChildrenChanged, false);
 }
 
 void AXObjectCache::selectedChildrenChanged(RenderObject* renderer)
 {
     // postToElement is false so that you can pass in any child of an element and it will go up the parent tree
     // to find the container which should send out the notification.
     postNotification(renderer, AXSelectedChildrenChanged, false);
 }
 
-void AXObjectCache::handleScrollbarUpdate(ScrollView* view)
+void AXObjectCache::handleScrollbarUpdate(FrameView* view)
 {
     if (!view)
         return;
 
     // We don't want to create a scroll view from this method, only update an existing one.
     if (AXObject* scrollViewObject = get(view)) {
         m_computedObjectAttributeCache->clear();
         scrollViewObject->updateChildrenIfNecessary();
     }
 }
@@ skipping 200 matching lines @@
     postPlatformNotification(focusedObject, AXFocusedUIElementChanged);
 }
 
 void AXObjectCache::handleScrolledToAnchor(const Node* anchorNode)
 {
     // The anchor node may not be accessible. Post the notification for the
     // first accessible object.
     postPlatformNotification(AXObject::firstAccessibleObjectFromNode(anchorNode), AXScrolledToAnchor);
 }
 
-void AXObjectCache::handleScrollPositionChanged(ScrollView* scrollView)
+void AXObjectCache::handleScrollPositionChanged(FrameView* scrollView)
 {
     postPlatformNotification(getOrCreate(scrollView), AXScrollPositionChanged);
 }
 
 void AXObjectCache::handleScrollPositionChanged(RenderObject* renderObject)
 {
     postPlatformNotification(getOrCreate(renderObject), AXScrollPositionChanged);
 }
 
 void AXObjectCache::setCanvasObjectBounds(Element* element, const LayoutRect& rect)
 {
     AXObject* obj = getOrCreate(element);
     if (!obj)
         return;
 
     obj->setElementRect(rect);
 }
 
 } // namespace blink