diff options
author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 14:52:25 +0000 |
---|---|---|
committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 14:52:25 +0000 |
commit | 245bed0b07a12b2753e236eb741eeda661154c14 (patch) | |
tree | dfa5472f37268c0f55b4fd831472d2081871ec1e /webkit/glue/webaccessibility.cc | |
parent | 1e1195e5b3e90338d9b8be979a75320902cee62f (diff) | |
download | chromium_src-245bed0b07a12b2753e236eb741eeda661154c14.zip chromium_src-245bed0b07a12b2753e236eb741eeda661154c14.tar.gz chromium_src-245bed0b07a12b2753e236eb741eeda661154c14.tar.bz2 |
Revert 57327 - Re-landing. Add html node info (tag name, attributes, and computed display)
and document info (url, title, mimetype, doctype) to WebAccessibility.
BUG=none
TEST=Modified unit test: RenderMessagesUnittest.WebAccessibility
Review URL: http://codereview.chromium.org/3013035
TBR=dmazzoni@chromium.org
Review URL: http://codereview.chromium.org/3132040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webaccessibility.cc')
-rw-r--r-- | webkit/glue/webaccessibility.cc | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/webkit/glue/webaccessibility.cc b/webkit/glue/webaccessibility.cc index 8b007d3..b6e0d5e 100644 --- a/webkit/glue/webaccessibility.cc +++ b/webkit/glue/webaccessibility.cc @@ -7,13 +7,6 @@ #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/WebFrame.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; @@ -292,33 +285,6 @@ void WebAccessibility::Init(const WebKit::WebAccessibilityObject& src, attributes[ATTR_HELP] = src.helpText(); if (src.keyboardShortcut().length()) attributes[ATTR_SHORTCUT] = src.keyboardShortcut(); - if (src.hasComputedStyle()) - attributes[ATTR_DISPLAY] = src.computedStyleDisplay(); - - WebKit::WebNode node = src.node(); - - if (!node.isNull() && node.isElementNode()) { - WebKit::WebElement element = node.to<WebKit::WebElement>(); - attributes[ATTR_HTML_TAG] = 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 (role == WebAccessibility::ROLE_DOCUMENT || - role == WebAccessibility::ROLE_WEB_AREA) { - WebKit::WebDocument document = src.document(); - 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"); - attributes[ATTR_DOC_DOCTYPE] = document.doctype().name(); - } // Add the source object to the cache and store its id. id = cache->addOrGetId(src); |