Commit 8ba3b681 authored by dcheng's avatar dcheng Committed by Commit bot

Use GetRoutingIdForFrameOrProxy helper in BlinkAXTreeSource.

BUG=none
R=dmazzoni@chromium.org

Review URL: https://codereview.chromium.org/1812783002

Cr-Commit-Position: refs/heads/master@{#381734}
parent e303e49e
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "content/renderer/render_frame_impl.h" #include "content/renderer/render_frame_impl.h"
#include "content/renderer/render_frame_proxy.h" #include "content/renderer/render_frame_proxy.h"
#include "content/renderer/render_view_impl.h" #include "content/renderer/render_view_impl.h"
#include "content/renderer/web_frame_utils.h"
#include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebRect.h"
#include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/platform/WebSize.h"
#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebString.h"
...@@ -170,14 +171,9 @@ AXContentTreeData BlinkAXTreeSource::GetTreeData() const { ...@@ -170,14 +171,9 @@ AXContentTreeData BlinkAXTreeSource::GetTreeData() const {
// Get the tree ID for the parent frame. // Get the tree ID for the parent frame.
blink::WebFrame* parent_web_frame = web_frame->parent(); blink::WebFrame* parent_web_frame = web_frame->parent();
if (parent_web_frame && parent_web_frame->isWebRemoteFrame()) { if (parent_web_frame) {
RenderFrameProxy* parent_render_frame_proxy = tree_data.parent_routing_id =
RenderFrameProxy::FromWebFrame(parent_web_frame); GetRoutingIdForFrameOrProxy(parent_web_frame);
tree_data.parent_routing_id = parent_render_frame_proxy->routing_id();
} else if (parent_web_frame && parent_web_frame->isWebLocalFrame()) {
RenderFrame* parent_render_frame = RenderFrame::FromWebFrame(
parent_web_frame);
tree_data.parent_routing_id = parent_render_frame->GetRoutingID();
} }
} }
...@@ -492,19 +488,10 @@ void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src, ...@@ -492,19 +488,10 @@ void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src,
// Iframe. // Iframe.
if (is_iframe) { if (is_iframe) {
WebFrame* frame = WebFrame::fromFrameOwnerElement(element); WebFrame* frame = WebFrame::fromFrameOwnerElement(element);
if (frame && frame->isWebRemoteFrame()) { if (frame) {
RenderFrameProxy* render_frame_proxy =
RenderFrameProxy::FromWebFrame(frame);
DCHECK(render_frame_proxy);
dst->AddContentIntAttribute( dst->AddContentIntAttribute(
AX_CONTENT_ATTR_CHILD_ROUTING_ID, AX_CONTENT_ATTR_CHILD_ROUTING_ID,
render_frame_proxy->routing_id()); GetRoutingIdForFrameOrProxy(frame));
} else if (frame && frame->isWebLocalFrame()) {
RenderFrame* render_frame = RenderFrame::FromWebFrame(frame);
DCHECK(render_frame);
dst->AddContentIntAttribute(
AX_CONTENT_ATTR_CHILD_ROUTING_ID,
render_frame->GetRoutingID());
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment