Use new WebElement attribute accessors so we can delete WebNamedNodeMap.

webkit/glue/webaccessibility.cc

 // Copyright (c) 2012 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"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityRole.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebAttribute.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocumentType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebNamedNodeMap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 
 using base::DoubleToString;
 using base::IntToString;
 using WebKit::WebAccessibilityRole;
 using WebKit::WebAccessibilityObject;
@@ skipping 718 matching lines @@
 
   if (!node.isNull() && node.isElementNode()) {
     WebKit::WebElement element = node.to<WebKit::WebElement>();
     is_iframe = (element.tagName() == ASCIIToUTF16("IFRAME"));
 
     // 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.
     string_attributes[ATTR_HTML_TAG] =
         StringToLowerASCII(string16(element.tagName()));
-    for (unsigned i = 0; i < element.attributes().length(); ++i) {
+    for (unsigned i = 0; i < element.attributeCount(); ++i) {
       string16 name = StringToLowerASCII(string16(
-          element.attributes().attributeItem(i).localName()));
-      string16 value = element.attributes().attributeItem(i).value();
+          element.attributeLocalName(i)));
+      string16 value = element.attributeValue(i);
       html_attributes.push_back(std::pair<string16, string16>(name, value));
     }
 
     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();
@@ skipping 180 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