Merge 2924: Avoid updateStyleAndLayoutTree in determineAccessibilityRole

third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp

Index: third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
index a3f6996883ed4e4f5a37bec51d2a2416ca6b1d21..a2852dbe62d0e727fd8b91e460c6fa09052f8ec8 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
@@ -527,11 +527,11 @@ AccessibilityRole AXNodeObject::determineAccessibilityRole() {
     return role;
   if (getNode()->isElementNode()) {
     Element* element = toElement(getNode());
-    if (element->isInCanvasSubtree()) {
-      getDocument()->updateStyleAndLayoutTreeForNode(element);
-      if (element->isFocusable())
-        return GroupRole;
-    }
+    // A generic element with tabIndex explicitly set gets GroupRole.
+    // The layout checks for focusability aren't critical here; a false
+    // positive would be harmless.
+    if (element->isInCanvasSubtree() && element->supportsFocus())
+      return GroupRole;
   }
   return UnknownRole;
 }