Merge FrameView and ScrollView.

Source/core/accessibility/AXScrollView.cpp

 /*
  * 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 16 matching lines @@
 #include "core/accessibility/AXScrollView.h"
 
 #include "core/accessibility/AXObjectCache.h"
 #include "core/accessibility/AXScrollbar.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 
 namespace blink {
 
-AXScrollView::AXScrollView(ScrollView* view)
+AXScrollView::AXScrollView(FrameView* view)
     : m_scrollView(view)
     , m_childrenDirty(false)
 {
 }
 
 AXScrollView::~AXScrollView()
 {
     ASSERT(isDetached());
 }
 
 void AXScrollView::detach()
 {
     AXObject::detach();
     m_scrollView = 0;
 }
 
-PassRefPtr<AXScrollView> AXScrollView::create(ScrollView* view)
+PassRefPtr<AXScrollView> AXScrollView::create(FrameView* view)
 {
     return adoptRef(new AXScrollView(view));
 }
 
 AXObject* AXScrollView::scrollBar(AccessibilityOrientation orientation)
 {
     updateScrollbars();
 
     switch (orientation) {
     case AccessibilityOrientationVertical:
@@ skipping 95 matching lines @@
         m_children.append(webArea);
 
     updateScrollbars();
 }
 
 AXObject* AXScrollView::webAreaObject() const
 {
     if (!m_scrollView || !m_scrollView->isFrameView())
         return 0;
 
-    Document* doc = toFrameView(m_scrollView)->frame().document();
+    Document* doc = m_scrollView->frame().document();
     if (!doc || !doc->renderView())
         return 0;
 
     return axObjectCache()->getOrCreate(doc);
 }
 
 AXObject* AXScrollView::accessibilityHitTest(const IntPoint& point) const
 {
     AXObject* webArea = webAreaObject();
     if (!webArea)
@@ skipping 13 matching lines @@
         return LayoutRect();
 
     return m_scrollView->frameRect();
 }
 
 FrameView* AXScrollView::documentFrameView() const
 {
     if (!m_scrollView || !m_scrollView->isFrameView())
         return 0;
 
-    return toFrameView(m_scrollView);
+    return m_scrollView;
 }
 
 AXObject* AXScrollView::parentObject() const
 {
     if (!m_scrollView || !m_scrollView->isFrameView())
         return 0;
 
     // FIXME: Broken for OOPI.
-    HTMLFrameOwnerElement* owner = toFrameView(m_scrollView)->frame().deprecatedLocalOwner();
+    HTMLFrameOwnerElement* owner = m_scrollView->frame().deprecatedLocalOwner();
     if (owner && owner->renderer())
         return axObjectCache()->getOrCreate(owner);
 
-    return axObjectCache()->getOrCreate(toFrameView(m_scrollView)->frame().pagePopupOwner());
+    return axObjectCache()->getOrCreate(m_scrollView->frame().pagePopupOwner());
 }
 
 AXObject* AXScrollView::parentObjectIfExists() const
 {
     if (!m_scrollView || !m_scrollView->isFrameView())
         return 0;
 
-    HTMLFrameOwnerElement* owner = toFrameView(m_scrollView)->frame().deprecatedLocalOwner();
+    HTMLFrameOwnerElement* owner = m_scrollView->frame().deprecatedLocalOwner();
     if (owner && owner->renderer())
         return axObjectCache()->get(owner);
 
-    return axObjectCache()->get(toFrameView(m_scrollView)->frame().pagePopupOwner());
+    return axObjectCache()->get(m_scrollView->frame().pagePopupOwner());
 }
 
 ScrollableArea* AXScrollView::getScrollableAreaIfScrollable() const
 {
     return m_scrollView;
 }
 
 void AXScrollView::scrollTo(const IntPoint& point) const
 {
     if (m_scrollView)
         m_scrollView->setScrollPosition(point);
 }
 
 } // namespace blink