commit 6a75507bb20e3efe56329b5a03fb9a28930d3d04
author mrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Feb 10 22:54:41 2010 +0000
committer mrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Feb 10 22:54:41 2010 +0000
tree 15a70a72fce58a13e76ff5a45ffe3e968aadc081
parent eb97b2cb4c66032e37ad138999c7c390c399e161

MSAA: selected, selectable, extended selectable, and multiple
selectable states are not reported

https://bugs.webkit.org/show_bug.cgi?id=33574
<rdar://problem/7536826>

Follow-up fix to account for the fact that different function names
are used on the branch.

* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::isMultiSelectable):
* accessibility/AccessibilityRenderObject.h:

git-svn-id: http://svn.webkit.org/repository/webkit/branches/safari-4-branch@54624 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2f7e165..4e33514 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,20 @@
 2010-02-10  Mark Rowe  <mrowe@apple.com>
 
+        MSAA: selected, selectable, extended selectable, and multiple
+        selectable states are not reported
+
+        https://bugs.webkit.org/show_bug.cgi?id=33574
+        <rdar://problem/7536826>
+
+        Follow-up fix to account for the fact that different function names
+        are used on the branch.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::isMultiSelectable):
+        * accessibility/AccessibilityRenderObject.h:
+
+2010-02-10  Mark Rowe  <mrowe@apple.com>
+
         Merge r54615.
 
     2010-02-10  Dan Bernstein  <mitz@apple.com>

WebCore/accessibility/AccessibilityRenderObject.cpp

diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index 6eb0b88..4af5e5a 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -373,7 +373,7 @@
     return m_renderer->node() && m_renderer->node()->hovered();
 }
 
-bool AccessibilityRenderObject::isMultiSelect() const
+bool AccessibilityRenderObject::isMultiSelectable() const
 {
     ASSERT(m_renderer);
     if (!m_renderer->isListBox())

WebCore/accessibility/AccessibilityRenderObject.h

diff --git a/WebCore/accessibility/AccessibilityRenderObject.h b/WebCore/accessibility/AccessibilityRenderObject.h
index 017d782..8bad0d0 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.h
+++ b/WebCore/accessibility/AccessibilityRenderObject.h
@@ -96,7 +96,7 @@
     virtual bool isHovered() const;
     virtual bool isIndeterminate() const;
     virtual bool isLoaded() const;
-    virtual bool isMultiSelect() const;
+    virtual bool isMultiSelectable() const;
     virtual bool isOffScreen() const;
     virtual bool isPressed() const;
     virtual bool isReadOnly() const;