Diff
Modified: trunk/Source/WebCore/ChangeLog (97628 => 97629)
--- trunk/Source/WebCore/ChangeLog 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/ChangeLog 2011-10-17 17:01:41 UTC (rev 97629)
@@ -1,3 +1,30 @@
+2011-10-17 Chris Fleizach <[email protected]>
+
+ AX: children() method should be consolidated in AccessibilityObject
+ https://bugs.webkit.org/show_bug.cgi?id=70243
+
+ Code cleanup, no new tests.
+
+ Reviewed by Darin Adler.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::children):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::updateChildrenIfNecessary):
+ * accessibility/AccessibilityRenderObject.h:
+ * accessibility/AccessibilityScrollView.cpp:
+ (WebCore::AccessibilityScrollView::updateChildrenIfNecessary):
+ (WebCore::AccessibilityScrollView::updateScrollbars):
+ (WebCore::AccessibilityScrollView::addChildren):
+ * accessibility/AccessibilityScrollView.h:
+ * accessibility/AccessibilitySlider.cpp:
+ * accessibility/AccessibilitySlider.h:
+ * accessibility/AccessibilityTableColumn.cpp:
+ * accessibility/AccessibilityTableColumn.h:
+ * accessibility/AccessibilityTableHeaderContainer.cpp:
+ * accessibility/AccessibilityTableHeaderContainer.h:
+
2011-10-17 Vsevolod Vlasov <[email protected]>
Web Inspector: Search matches highlighting in text does not work correctly.
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2011-10-17 17:01:41 UTC (rev 97629)
@@ -1011,7 +1011,14 @@
return object->documentFrameView();
}
+
+const AccessibilityObject::AccessibilityChildrenVector& AccessibilityObject::children()
+{
+ updateChildrenIfNecessary();
+ return m_children;
+}
+
void AccessibilityObject::updateChildrenIfNecessary()
{
if (!hasChildren())
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2011-10-17 17:01:41 UTC (rev 97629)
@@ -552,7 +552,7 @@
virtual void childrenChanged() { }
virtual void contentChanged() { }
- virtual const AccessibilityChildrenVector& children() { return m_children; }
+ const AccessibilityChildrenVector& children();
virtual void addChildren() { }
virtual bool canHaveChildren() const { return true; }
virtual bool hasChildren() const { return m_haveChildren; }
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-10-17 17:01:41 UTC (rev 97629)
@@ -3473,13 +3473,6 @@
AccessibilityObject::updateChildrenIfNecessary();
}
-
-const AccessibilityObject::AccessibilityChildrenVector& AccessibilityRenderObject::children()
-{
- updateChildrenIfNecessary();
-
- return m_children;
-}
void AccessibilityRenderObject::addChildren()
{
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2011-10-17 17:01:41 UTC (rev 97629)
@@ -201,7 +201,6 @@
virtual FrameView* documentFrameView() const;
virtual unsigned hierarchicalLevel() const;
- virtual const AccessibilityChildrenVector& children();
virtual void clearChildren();
virtual void updateChildrenIfNecessary();
Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2011-10-17 17:01:41 UTC (rev 97629)
@@ -59,13 +59,6 @@
return 0;
}
-const AccessibilityObject::AccessibilityChildrenVector& AccessibilityScrollView::children()
-{
- if (!m_haveChildren)
- addChildren();
- return m_children;
-}
-
// If this is WebKit1 then the native scroll view needs to return the
// AX information (because there are no scroll bar children in the ScrollView object in WK1).
// In WebKit2, the ScrollView object will return the AX information (because there are no platform widgets).
@@ -81,6 +74,14 @@
void AccessibilityScrollView::updateChildrenIfNecessary()
{
+ if (!m_haveChildren)
+ addChildren();
+
+ updateScrollbars();
+}
+
+void AccessibilityScrollView::updateScrollbars()
+{
if (m_scrollView->horizontalScrollbar() && !m_horizontalScrollbar)
m_horizontalScrollbar = addChildScrollbar(m_scrollView->horizontalScrollbar());
else if (!m_scrollView->horizontalScrollbar() && m_horizontalScrollbar) {
@@ -125,7 +126,7 @@
if (webArea)
m_children.append(webArea);
- updateChildrenIfNecessary();
+ updateScrollbars();
}
AccessibilityObject* AccessibilityScrollView::webAreaObject() const
Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollView.h (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilityScrollView.h 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollView.h 2011-10-17 17:01:41 UTC (rev 97629)
@@ -53,8 +53,8 @@
virtual AccessibilityObject* scrollBar(AccessibilityOrientation) const;
virtual void addChildren();
virtual AccessibilityObject* accessibilityHitTest(const LayoutPoint&) const;
- virtual const AccessibilityChildrenVector& children();
virtual void updateChildrenIfNecessary();
+ void updateScrollbars();
virtual FrameView* documentFrameView() const;
virtual LayoutRect elementRect() const;
Modified: trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp 2011-10-17 17:01:41 UTC (rev 97629)
@@ -50,13 +50,6 @@
return adoptRef(new AccessibilitySlider(renderer));
}
-const AccessibilityObject::AccessibilityChildrenVector& AccessibilitySlider::children()
-{
- if (!m_haveChildren)
- addChildren();
- return m_children;
-}
-
AccessibilityOrientation AccessibilitySlider::orientation() const
{
// Default to horizontal in the unknown case.
Modified: trunk/Source/WebCore/accessibility/AccessibilitySlider.h (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilitySlider.h 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilitySlider.h 2011-10-17 17:01:41 UTC (rev 97629)
@@ -54,7 +54,6 @@
virtual bool isSlider() const { return true; }
virtual bool isInputSlider() const { return true; }
- virtual const AccessibilityChildrenVector& children();
virtual void addChildren();
virtual bool canSetValueAttribute() const { return true; }
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp 2011-10-17 17:01:41 UTC (rev 97629)
@@ -72,14 +72,7 @@
{
return elementRect().size();
}
-
-const AccessibilityObject::AccessibilityChildrenVector& AccessibilityTableColumn::children()
-{
- if (!m_haveChildren)
- addChildren();
- return m_children;
-}
-
+
AccessibilityObject* AccessibilityTableColumn::headerObject()
{
if (!m_parent)
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h 2011-10-17 17:01:41 UTC (rev 97629)
@@ -54,7 +54,6 @@
void setColumnIndex(int columnIndex) { m_columnIndex = columnIndex; }
int columnIndex() const { return m_columnIndex; }
- virtual const AccessibilityChildrenVector& children();
virtual void addChildren();
virtual void setParent(AccessibilityObject*);
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp 2011-10-17 17:01:41 UTC (rev 97629)
@@ -49,13 +49,6 @@
return adoptRef(new AccessibilityTableHeaderContainer());
}
-const AccessibilityObject::AccessibilityChildrenVector& AccessibilityTableHeaderContainer::children()
-{
- if (!m_haveChildren)
- addChildren();
- return m_children;
-}
-
LayoutRect AccessibilityTableHeaderContainer::elementRect() const
{
// this will be filled in when addChildren is called
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.h (97628 => 97629)
--- trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.h 2011-10-17 16:56:13 UTC (rev 97628)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.h 2011-10-17 17:01:41 UTC (rev 97629)
@@ -45,7 +45,6 @@
virtual AccessibilityRole roleValue() const { return TableHeaderContainerRole; }
- virtual const AccessibilityChildrenVector& children();
virtual void addChildren();
virtual LayoutSize size() const;
