From 245bed0b07a12b2753e236eb741eeda661154c14 Mon Sep 17 00:00:00 2001 From: "dmazzoni@chromium.org" Date: Wed, 25 Aug 2010 14:52:25 +0000 Subject: 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 --- webkit/glue/webaccessibility.cc | 34 ---------------------------------- webkit/glue/webaccessibility.h | 12 ------------ 2 files changed, 46 deletions(-) (limited to 'webkit') 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(); - attributes[ATTR_HTML_TAG] = element.tagName(); - for (unsigned i = 0; i < element.attributes().length(); i++) { - html_attributes.push_back( - std::pair( - 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); diff --git a/webkit/glue/webaccessibility.h b/webkit/glue/webaccessibility.h index 1836948..305bc0ca 100644 --- a/webkit/glue/webaccessibility.h +++ b/webkit/glue/webaccessibility.h @@ -147,20 +147,9 @@ struct WebAccessibility { STATE_UNAVAILABLE }; - // Additional optional attributes that can be optionally attached to - // a node. enum Attribute { - // Doc attributes: only make sense when applied to the top-level - // Document node. - ATTR_DOC_URL, - ATTR_DOC_TITLE, - ATTR_DOC_MIMETYPE, - ATTR_DOC_DOCTYPE, - - // Attributes that could apply to any node. ATTR_ACTION, ATTR_DESCRIPTION, - ATTR_DISPLAY, ATTR_HELP, ATTR_HTML_TAG, ATTR_LINK_TARGET, @@ -191,7 +180,6 @@ struct WebAccessibility { WebKit::WebRect location; std::map attributes; std::vector children; - std::vector > html_attributes; }; } // namespace webkit_glue -- cgit v1.1