Make the selection start and end attributes of an html input control...

webkit/glue/webaccessibility.cc

 // Copyright (c) 2010 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 "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityCache.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityRole.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebAttribute.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocumentType.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNamedNodeMap.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 
 using WebKit::WebAccessibilityCache;
 using WebKit::WebAccessibilityRole;
 using WebKit::WebAccessibilityObject;
 
 namespace webkit_glue {
 
@@ skipping 299 matching lines @@
     // TODO(ctguil): The tagName in WebKit is lower cased but
     // HTMLElement::nodeName calls localNameUpper. Consider adding
     // a WebElement method that returns the original lower cased tagName.
     attributes[ATTR_HTML_TAG] = StringToLowerASCII(string16(element.tagName()));
     for (unsigned i = 0; i < element.attributes().length(); i++) {
       html_attributes.push_back(
           std::pair<string16, string16>(
               element.attributes().attributeItem(i).localName(),
               element.attributes().attributeItem(i).value()));
     }
+
+    if (element.isFormControlElement()) {
+      WebKit::WebFormControlElement form_element =
+          element.to<WebKit::WebFormControlElement>();
+      if (form_element.formControlType() == ASCIIToUTF16("text")) {
+        WebKit::WebInputElement input_element =
+            form_element.to<WebKit::WebInputElement>();
+        attributes[ATTR_TEXT_SEL_START] = base::IntToString16(
+            input_element.selectionStart());
+        attributes[ATTR_TEXT_SEL_END] = base::IntToString16(
+            input_element.selectionEnd());
+      }
+    }
   }
 
   if (role == WebAccessibility::ROLE_DOCUMENT ||
       role == WebAccessibility::ROLE_WEB_AREA) {
-    WebKit::WebDocument document = src.document();
+    const WebKit::WebDocument& document = src.document();
     if (name.empty())
       name = document.title();
     attributes[ATTR_DOC_TITLE] = document.title();
     attributes[ATTR_DOC_URL] = document.frame()->url().spec().utf16();
     if (document.isXHTMLDocument())
       attributes[ATTR_DOC_MIMETYPE] = WebKit::WebString("text/xhtml");
     else
       attributes[ATTR_DOC_MIMETYPE] = WebKit::WebString("text/html");
 
-    WebKit::WebDocumentType doctype = document.doctype();
+    const WebKit::WebDocumentType& doctype = document.doctype();
     if (!doctype.isNull())
       attributes[ATTR_DOC_DOCTYPE] = doctype.name();
   }
 
   // Add the source object to the cache and store its id.
   id = cache->addOrGetId(src);
 
   // Recursively create children.
   int child_count = src.childCount();
   for (int i = 0; i < child_count; i++) {
     WebAccessibilityObject child = src.childAt(i);
 
     // The child may be invalid due to issues in webkit accessibility code.
     // Don't add children are invalid thus preventing a crash.
     // https://bugs.webkit.org/show_bug.cgi?id=44149
     // TODO(ctguil): We may want to remove this check as webkit stabilizes.
     if (child.isValid())
       children.push_back(WebAccessibility(child, cache));
   }
 }
 
 }  // namespace webkit_glue