Index: webkit/glue/webaccessibility.cc |
diff --git a/webkit/glue/webaccessibility.cc b/webkit/glue/webaccessibility.cc |
index b6b8f4c1fdd3798cd8439f9208474fa6cf872f61..6581646fd25e50c23dc9826a0c2e468c9a25fa21 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 @@ void WebAccessibility::Init(const WebKit::WebAccessibilityObject& src, |
// 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)); |
} |