summaryrefslogtreecommitdiff
path: root/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-09-18 15:53:33 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-09-18 15:53:33 +0200
commit6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (patch)
treed9c68d1cca0b3e352f1e438561f3e504e641a08f /Source/WebCore/accessibility/AccessibilityNodeObject.cpp
parentd0424a769059c84ae20beb3c217812792ea6726b (diff)
downloadqtwebkit-6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2.tar.gz
Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (http://svn.webkit.org/repository/webkit/trunk@128886)
New snapshot with various build fixes
Diffstat (limited to 'Source/WebCore/accessibility/AccessibilityNodeObject.cpp')
-rw-r--r--Source/WebCore/accessibility/AccessibilityNodeObject.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
index 5ba64c0b6..a07380f47 100644
--- a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
+++ b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
@@ -372,7 +372,7 @@ bool AccessibilityNodeObject::isWebArea() const
bool AccessibilityNodeObject::isImageButton() const
{
- return isNativeImage() && roleValue() == ButtonRole;
+ return isNativeImage() && isButton();
}
bool AccessibilityNodeObject::isAnchor() const
@@ -565,7 +565,7 @@ bool AccessibilityNodeObject::isIndeterminate() const
bool AccessibilityNodeObject::isPressed() const
{
- if (roleValue() != ButtonRole)
+ if (!isButton())
return false;
Node* node = this->node();
@@ -875,6 +875,7 @@ Element* AccessibilityNodeObject::actionElement() const
switch (roleValue()) {
case ButtonRole:
case PopUpButtonRole:
+ case ToggleButtonRole:
case TabRole:
case MenuItemRole:
case ListItemRole:
@@ -1212,6 +1213,7 @@ String AccessibilityNodeObject::title() const
switch (roleValue()) {
case PopUpButtonRole:
case ButtonRole:
+ case ToggleButtonRole:
case CheckBoxRole:
case ListBoxOptionRole:
case MenuButtonRole: