commit 74b9a19c6d6925b231aa9be832edaedb60f7470c
author dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Apr 20 23:16:17 2012
committer dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Apr 20 23:16:17 2012
tree 143a10ab004312672540a039e92f0e4cc2943351
parent 1af07b4c2b17e8fdb430d696b0633c5a6ea445d6

Use new WebElement attribute accessors so we can delete WebNamedNodeMap.

BUG=123094
TEST=none


Review URL: http://codereview.chromium.org/10161009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133299 0039d316-1c4b-4281-b951-d872f2087c98

webkit/glue/webaccessibility.cc

diff --git a/webkit/glue/webaccessibility.cc b/webkit/glue/webaccessibility.cc
index b6b8f4c..6581646 100644
--- a/webkit/glue/webaccessibility.cc
+++ b/webkit/glue/webaccessibility.cc
@@ -11,14 +11,12 @@
 #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"
@@ -757,10 +755,10 @@
     // 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));
     }