Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: content/renderer/accessibility/blink_ax_tree_source.cc

Issue 2217363002: Use relative bounding boxes throughout Chrome accessibility (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address feedback from aboxhall Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/accessibility_messages.h ('k') | content/renderer/accessibility/render_accessibility_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/accessibility/blink_ax_tree_source.cc
diff --git a/content/renderer/accessibility/blink_ax_tree_source.cc b/content/renderer/accessibility/blink_ax_tree_source.cc
index e405eb7361b85c8ec2373ba8a28e68d1c9910085..bc55845aa20f4a80ab89cfffa2aed950ab4bb4ba 100644
--- a/content/renderer/accessibility/blink_ax_tree_source.cc
+++ b/content/renderer/accessibility/blink_ax_tree_source.cc
@@ -19,6 +19,7 @@
#include "content/renderer/render_frame_proxy.h"
#include "content/renderer/render_view_impl.h"
#include "content/renderer/web_frame_utils.h"
+#include "third_party/WebKit/public/platform/WebFloatRect.h"
#include "third_party/WebKit/public/platform/WebRect.h"
#include "third_party/WebKit/public/platform/WebSize.h"
#include "third_party/WebKit/public/platform/WebString.h"
@@ -40,6 +41,7 @@ using base::UTF16ToUTF8;
using blink::WebAXObject;
using blink::WebDocument;
using blink::WebElement;
+using blink::WebFloatRect;
using blink::WebFrame;
using blink::WebLocalFrame;
using blink::WebNode;
@@ -265,9 +267,19 @@ void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src,
AXContentNodeData* dst) const {
dst->role = AXRoleFromBlink(src.role());
dst->state = AXStateFromBlink(src);
- dst->location = gfx::RectF(src.boundingBoxRect());
dst->id = src.axID();
+ WebAXObject offset_container;
+ WebFloatRect bounds_in_container;
+ SkMatrix44 container_transform;
+ src.getRelativeBounds(
+ offset_container, bounds_in_container, container_transform);
+ dst->location = bounds_in_container;
+ if (!container_transform.isIdentity())
+ dst->transform = base::WrapUnique(new gfx::Transform(container_transform));
+ if (!offset_container.isDetached())
+ dst->offset_container_id = offset_container.axID();
+
blink::WebAXNameFrom nameFrom;
blink::WebVector<blink::WebAXObject> nameObjects;
blink::WebString web_name = src.name(nameFrom, nameObjects);
@@ -581,11 +593,8 @@ void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src,
src.minValueForRange());
}
- if (dst->role == ui::AX_ROLE_ROOT_WEB_AREA) {
+ if (dst->role == ui::AX_ROLE_ROOT_WEB_AREA)
dst->AddStringAttribute(ui::AX_ATTR_HTML_TAG, "#document");
- dst->transform.reset(
- new gfx::Transform(src.transformFromLocalParentFrame()));
- }
if (dst->role == ui::AX_ROLE_TABLE) {
int column_count = src.columnCount();
« no previous file with comments | « content/common/accessibility_messages.h ('k') | content/renderer/accessibility/render_accessibility_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698