Index: Source/core/accessibility/AccessibilityScrollView.cpp |
diff --git a/Source/core/accessibility/AccessibilityScrollView.cpp b/Source/core/accessibility/AccessibilityScrollView.cpp |
index 9a4acc032678912fd4bc2cf26d23d0e3bd9189d2..f9ef6757d5ea35a0a04f06ca47456de29dd7e2df 100644 |
--- a/Source/core/accessibility/AccessibilityScrollView.cpp |
+++ b/Source/core/accessibility/AccessibilityScrollView.cpp |
@@ -32,7 +32,7 @@ |
#include "core/page/FrameView.h" |
namespace WebCore { |
- |
+ |
AccessibilityScrollView::AccessibilityScrollView(ScrollView* view) |
: m_scrollView(view) |
, m_childrenDirty(false) |
@@ -54,18 +54,18 @@ PassRefPtr<AccessibilityScrollView> AccessibilityScrollView::create(ScrollView* |
{ |
return adoptRef(new AccessibilityScrollView(view)); |
} |
- |
+ |
AccessibilityObject* AccessibilityScrollView::scrollBar(AccessibilityOrientation orientation) |
{ |
updateScrollbars(); |
- |
+ |
switch (orientation) { |
case AccessibilityOrientationVertical: |
return m_verticalScrollbar ? m_verticalScrollbar.get() : 0; |
case AccessibilityOrientationHorizontal: |
return m_horizontalScrollbar ? m_horizontalScrollbar.get() : 0; |
} |
- |
+ |
return 0; |
} |
@@ -81,7 +81,7 @@ Widget* AccessibilityScrollView::widgetForAttachmentView() const |
{ |
return m_scrollView; |
} |
- |
+ |
void AccessibilityScrollView::updateChildrenIfNecessary() |
{ |
if (m_childrenDirty) |
@@ -89,7 +89,7 @@ void AccessibilityScrollView::updateChildrenIfNecessary() |
if (!m_haveChildren) |
addChildren(); |
- |
+ |
updateScrollbars(); |
} |
@@ -112,7 +112,7 @@ void AccessibilityScrollView::updateScrollbars() |
m_verticalScrollbar = 0; |
} |
} |
- |
+ |
void AccessibilityScrollView::removeChildScrollbar(AccessibilityObject* scrollbar) |
{ |
size_t pos = m_children.find(scrollbar); |
@@ -121,18 +121,18 @@ void AccessibilityScrollView::removeChildScrollbar(AccessibilityObject* scrollba |
m_children.remove(pos); |
} |
} |
- |
+ |
AccessibilityScrollbar* AccessibilityScrollView::addChildScrollbar(Scrollbar* scrollbar) |
{ |
if (!scrollbar) |
return 0; |
- |
+ |
AccessibilityScrollbar* scrollBarObject = static_cast<AccessibilityScrollbar*>(axObjectCache()->getOrCreate(scrollbar)); |
scrollBarObject->setParent(this); |
m_children.append(scrollBarObject); |
return scrollBarObject; |
} |
- |
+ |
void AccessibilityScrollView::clearChildren() |
{ |
AccessibilityObject::clearChildren(); |
@@ -145,7 +145,7 @@ bool AccessibilityScrollView::computeAccessibilityIsIgnored() const |
AccessibilityObject* webArea = webAreaObject(); |
if (!webArea) |
return true; |
- |
+ |
return webArea->accessibilityIsIgnored(); |
} |
@@ -153,11 +153,11 @@ void AccessibilityScrollView::addChildren() |
{ |
ASSERT(!m_haveChildren); |
m_haveChildren = true; |
- |
+ |
AccessibilityObject* webArea = webAreaObject(); |
if (webArea && !webArea->accessibilityIsIgnored()) |
m_children.append(webArea); |
- |
+ |
updateScrollbars(); |
} |
@@ -165,7 +165,7 @@ AccessibilityObject* AccessibilityScrollView::webAreaObject() const |
{ |
if (!m_scrollView || !m_scrollView->isFrameView()) |
return 0; |
- |
+ |
Document* doc = toFrameView(m_scrollView)->frame()->document(); |
if (!doc || !doc->renderer()) |
return 0; |
@@ -178,12 +178,12 @@ AccessibilityObject* AccessibilityScrollView::accessibilityHitTest(const IntPoin |
AccessibilityObject* webArea = webAreaObject(); |
if (!webArea) |
return 0; |
- |
+ |
if (m_horizontalScrollbar && m_horizontalScrollbar->elementRect().contains(point)) |
return m_horizontalScrollbar.get(); |
if (m_verticalScrollbar && m_verticalScrollbar->elementRect().contains(point)) |
return m_verticalScrollbar.get(); |
- |
+ |
return webArea->accessibilityHitTest(point); |
} |
@@ -199,31 +199,31 @@ FrameView* AccessibilityScrollView::documentFrameView() const |
{ |
if (!m_scrollView || !m_scrollView->isFrameView()) |
return 0; |
- |
+ |
return toFrameView(m_scrollView); |
-} |
+} |
AccessibilityObject* AccessibilityScrollView::parentObject() const |
{ |
if (!m_scrollView || !m_scrollView->isFrameView()) |
return 0; |
- |
+ |
HTMLFrameOwnerElement* owner = toFrameView(m_scrollView)->frame()->ownerElement(); |
if (owner && owner->renderer()) |
return axObjectCache()->getOrCreate(owner); |
return 0; |
} |
- |
+ |
AccessibilityObject* AccessibilityScrollView::parentObjectIfExists() const |
{ |
if (!m_scrollView || !m_scrollView->isFrameView()) |
return 0; |
- |
+ |
HTMLFrameOwnerElement* owner = toFrameView(m_scrollView)->frame()->ownerElement(); |
if (owner && owner->renderer()) |
return axObjectCache()->get(owner); |
- |
+ |
return 0; |
} |
@@ -238,4 +238,4 @@ void AccessibilityScrollView::scrollTo(const IntPoint& point) const |
m_scrollView->setScrollPosition(point); |
} |
-} // namespace WebCore |
+} // namespace WebCore |