Re-land 108318 now that patch for WebKit bug 71561 has landed

webkit/glue/webaccessibility.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webaccessibility.h"
 
 #include <set>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 802 matching lines @@
     // a WebElement method that returns the original lower cased tagName.
     string_attributes[ATTR_HTML_TAG] =
         StringToLowerASCII(string16(element.tagName()));
     for (unsigned i = 0; i < element.attributes().length(); ++i) {
       string16 name = StringToLowerASCII(string16(
           element.attributes().attributeItem(i).localName()));
       string16 value = element.attributes().attributeItem(i).value();
       html_attributes.push_back(std::pair<string16, string16>(name, value));
     }
 
-    if (element.isFormControlElement()) {
-      WebKit::WebFormControlElement form_element =
-          element.to<WebKit::WebFormControlElement>();
-      if (form_element.formControlType() == ASCIIToUTF16("text") ||
-          form_element.formControlType() == ASCIIToUTF16("textarea")) {
-        // Jaws gets confused by children of text fields, so we ignore them.
-        include_children = false;
+    if (role == ROLE_EDITABLE_TEXT ||
+        role == ROLE_TEXTAREA ||
+        role == ROLE_TEXT_FIELD) {
+      // Jaws gets confused by children of text fields, so we ignore them.
+      include_children = false;
 
-        int_attributes[ATTR_TEXT_SEL_START] = src.selectionStart();
-        int_attributes[ATTR_TEXT_SEL_END] = src.selectionEnd();
-        WebKit::WebVector<int> src_line_breaks;
-        src.lineBreaks(src_line_breaks);
-        line_breaks.reserve(src_line_breaks.size());
-        for (size_t i = 0; i < src_line_breaks.size(); ++i)
-          line_breaks.push_back(src_line_breaks[i]);
-      }
+      int_attributes[ATTR_TEXT_SEL_START] = src.selectionStart();
+      int_attributes[ATTR_TEXT_SEL_END] = src.selectionEnd();
+      WebKit::WebVector<int> src_line_breaks;
+      src.lineBreaks(src_line_breaks);
+      line_breaks.reserve(src_line_breaks.size());
+      for (size_t i = 0; i < src_line_breaks.size(); ++i)
+        line_breaks.push_back(src_line_breaks[i]);
     }
 
     // ARIA role.
     if (element.hasAttribute("role")) {
       string_attributes[ATTR_ROLE] = element.getAttribute("role");
     }
 
     // Live region attributes
     if (element.hasAttribute("aria-atomic")) {
       bool_attributes[ATTR_LIVE_ATOMIC] =
@@ skipping 156 matching lines @@
 bool WebAccessibility::IsParentUnignoredOf(
     const WebKit::WebAccessibilityObject& ancestor,
     const WebKit::WebAccessibilityObject& child) {
   WebKit::WebAccessibilityObject parent = child.parentObject();
   while (!parent.isNull() && parent.accessibilityIsIgnored())
     parent = parent.parentObject();
   return parent.equals(ancestor);
 }
 
 }  // namespace webkit_glue