Merge r175100 - AX: Do the early return when role is different than U…

…nknownRole https://bugs.webkit.org/show_bug.cgi?id=137880 Reviewed by Chris Fleizach. We do not need to call ariaRoleAttribute() to check whether m_ariaRole is different than UnknownRole. Just check m_ariaRole instead. No new tests, no behavior change, just some cleanup * accessibility/AccessibilityNodeObject.cpp: (WebCore::AccessibilityNodeObject::determineAccessibilityRole): * accessibility/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::determineAccessibilityRole): * accessibility/AccessibilityTableRow.cpp: (WebCore::AccessibilityTableRow::determineAccessibilityRole): Canonical link: https://commits.webkit.org/154760.156@webkitgtk/2.6 git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@175908 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Nov 11, 2014 · ff3c261 · ff3c261
1 parent f2e7b2c
commit ff3c261
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2014-10-23  Krzysztof Czech  <k.czech@samsung.com>
+
+        AX: Do the early return when role is different than UnknownRole
+        https://bugs.webkit.org/show_bug.cgi?id=137880
+
+        Reviewed by Chris Fleizach.
+
+        We do not need to call ariaRoleAttribute() to check whether m_ariaRole is different than UnknownRole.
+        Just check m_ariaRole instead.
+
+        No new tests, no behavior change, just some cleanup
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::determineAccessibilityRole):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+        * accessibility/AccessibilityTableRow.cpp:
+        (WebCore::AccessibilityTableRow::determineAccessibilityRole):
+
 2014-10-23  Milan Crha  <mcrha@redhat.com>
 
         RenderThemeGtk::mediaControlsScript() is not defined when VIDEO is disabled.

diff --git a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
@@ -278,12 +278,9 @@ AccessibilityRole AccessibilityNodeObject::determineAccessibilityRole()
     if (!node())
         return UnknownRole;
 
-    m_ariaRole = determineAriaRoleAttribute();
+    if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
+        return m_ariaRole;
 
-    AccessibilityRole ariaRole = ariaRoleAttribute();
-    if (ariaRole != UnknownRole)
-        return ariaRole;
-
     if (node()->isLink())
         return WebCoreLinkRole;
     if (node()->isTextNode())

diff --git a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp b/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -2470,13 +2470,10 @@ AccessibilityRole AccessibilityRenderObject::determineAccessibilityRole()
     if (!m_renderer)
         return UnknownRole;
 
-    m_ariaRole = determineAriaRoleAttribute();
+    if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
+        return m_ariaRole;
 
     Node* node = m_renderer->node();
-    AccessibilityRole ariaRole = ariaRoleAttribute();
-    if (ariaRole != UnknownRole)
-        return ariaRole;
-
     RenderBoxModelObject* cssBox = renderBoxModelObject();
 
     if (node && node->isLink()) {

diff --git a/Source/WebCore/accessibility/AccessibilityTableRow.cpp b/Source/WebCore/accessibility/AccessibilityTableRow.cpp
@@ -61,11 +61,8 @@ AccessibilityRole AccessibilityTableRow::determineAccessibilityRole()
     if (!isTableRow())
         return AccessibilityRenderObject::determineAccessibilityRole();
 
-    m_ariaRole = determineAriaRoleAttribute();
-
-    AccessibilityRole ariaRole = ariaRoleAttribute();
-    if (ariaRole != UnknownRole)
-        return ariaRole;
+    if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
+        return m_ariaRole;
 
     return RowRole;
 }