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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1051923003: Add a WebContentsImpl API to snapshot the accessibility tree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up callbacks before end of OnRenderProcessGone Created 5 years, 8 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
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index d4cc6f50c5f352ef7c908d8f5601785b97335ec6..6d899102f8ed1db25f849dffd8168f1666078d26 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -64,6 +64,7 @@
#include "content/public/common/url_constants.h"
#include "content/public/common/url_utils.h"
#include "ui/accessibility/ax_tree.h"
+#include "ui/accessibility/ax_tree_update.h"
#include "url/gurl.h"
#if defined(OS_MACOSX)
@@ -381,6 +382,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
OnAccessibilityLocationChanges)
IPC_MESSAGE_HANDLER(AccessibilityHostMsg_FindInPageResult,
OnAccessibilityFindInPageResult)
+ IPC_MESSAGE_HANDLER(AccessibilityHostMsg_SnapshotResponse,
+ OnAccessibilitySnapshotResponse)
IPC_MESSAGE_HANDLER(FrameHostMsg_ToggleFullscreen, OnToggleFullscreen)
// The following message is synthetic and doesn't come from RenderFrame, but
// from RenderProcessHost.
@@ -1069,6 +1072,12 @@ void RenderFrameHostImpl::OnRenderProcessGone(int status, int exit_code) {
SetRenderFrameCreated(false);
InvalidateMojoConnection();
+ // Execute any pending AX tree snapshot callbacks with an empty response,
+ // since we're never going to get a response from this renderer.
+ for (const auto& iter : ax_tree_snapshot_callbacks_)
+ iter.second.Run(ui::AXTreeUpdate());
+ ax_tree_snapshot_callbacks_.clear();
+
if (frame_tree_node_->IsMainFrame()) {
// RenderViewHost/RenderWidgetHost needs to reset some stuff.
render_view_host_->RendererExited(
@@ -1078,6 +1087,10 @@ void RenderFrameHostImpl::OnRenderProcessGone(int status, int exit_code) {
render_view_host_, static_cast<base::TerminationStatus>(status),
exit_code);
}
+
+ // Note: don't add any more code at this point in the function because
+ // |this| may be deleted. Any additional cleanup should happen before
+ // the last block of code here.
}
void RenderFrameHostImpl::OnSwappedOut() {
@@ -1392,6 +1405,18 @@ void RenderFrameHostImpl::OnAccessibilityFindInPageResult(
}
}
+void RenderFrameHostImpl::OnAccessibilitySnapshotResponse(
+ int callback_id,
+ const ui::AXTreeUpdate& snapshot) {
+ const auto& it = ax_tree_snapshot_callbacks_.find(callback_id);
+ if (it != ax_tree_snapshot_callbacks_.end()) {
+ it->second.Run(snapshot);
+ ax_tree_snapshot_callbacks_.erase(it);
+ } else {
+ NOTREACHED() << "Received AX tree snapshot response for unknown id";
+ }
+}
+
void RenderFrameHostImpl::OnToggleFullscreen(bool enter_fullscreen) {
if (enter_fullscreen)
delegate_->EnterFullscreenMode(GetLastCommittedURL().GetOrigin());
@@ -1805,6 +1830,14 @@ void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) {
Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode));
}
+void RenderFrameHostImpl::RequestAXTreeSnapshot(
+ AXTreeSnapshotCallback callback) {
+ static int next_id = 1;
+ int callback_id = next_id++;
+ Send(new AccessibilityMsg_SnapshotTree(routing_id_, callback_id));
+ ax_tree_snapshot_callbacks_.insert(std::make_pair(callback_id, callback));
+}
+
void RenderFrameHostImpl::SetAccessibilityCallbackForTesting(
const base::Callback<void(ui::AXEvent, int)>& callback) {
accessibility_testing_callback_ = callback;
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698