Title: [175100] trunk/Source/WebCore
- Revision
- 175100
- Author
- [email protected]
- Date
- 2014-10-23 02:02:00 -0700 (Thu, 23 Oct 2014)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (175099 => 175100)
--- trunk/Source/WebCore/ChangeLog 2014-10-23 08:21:40 UTC (rev 175099)
+++ trunk/Source/WebCore/ChangeLog 2014-10-23 09:02:00 UTC (rev 175100)
@@ -1,3 +1,22 @@
+2014-10-23 Krzysztof Czech <[email protected]>
+
+ 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 Yusuke Suzuki <[email protected]>
CSS JIT: Implement :matches
Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (175099 => 175100)
--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-10-23 08:21:40 UTC (rev 175099)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-10-23 09:02:00 UTC (rev 175100)
@@ -281,12 +281,9 @@
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())
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (175099 => 175100)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-10-23 08:21:40 UTC (rev 175099)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-10-23 09:02:00 UTC (rev 175100)
@@ -2446,13 +2446,10 @@
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()) {
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp (175099 => 175100)
--- trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp 2014-10-23 08:21:40 UTC (rev 175099)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp 2014-10-23 09:02:00 UTC (rev 175100)
@@ -61,12 +61,9 @@
if (!isTableRow())
return AccessibilityRenderObject::determineAccessibilityRole();
- m_ariaRole = determineAriaRoleAttribute();
+ if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
+ return m_ariaRole;
- AccessibilityRole ariaRole = ariaRoleAttribute();
- if (ariaRole != UnknownRole)
- return ariaRole;
-
return RowRole;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
