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 fdfa5584f5fe81be53d48c404d8ac5a8da5eea88..491507d3101fca2a6fb56ff5d16efa413d4337bc 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -452,23 +452,27 @@ BrowserAccessibilityManager* RenderFrameHostImpl::AccessibilityGetChildFrame( |
int accessibility_node_id) { |
RenderFrameHostImpl* child_frame = |
FrameAccessibility::GetInstance()->GetChild(this, accessibility_node_id); |
- if (!child_frame) |
- return NULL; |
+ if (!child_frame || IsSameSiteInstance(child_frame)) |
+ return nullptr; |
- // Return NULL if this isn't an out-of-process iframe. Same-process iframes |
- // are already part of the accessibility tree. |
- if (child_frame->GetProcess()->GetID() == GetProcess()->GetID()) |
- return NULL; |
+ return child_frame->GetOrCreateBrowserAccessibilityManager(); |
+} |
- // As a sanity check, make sure the frame we're going to return belongs |
- // to the same BrowserContext. |
- if (GetSiteInstance()->GetBrowserContext() != |
- child_frame->GetSiteInstance()->GetBrowserContext()) { |
- NOTREACHED(); |
- return NULL; |
- } |
+void RenderFrameHostImpl::AccessibilityGetAllChildFrames( |
+ std::vector<BrowserAccessibilityManager*>* child_frames) { |
+ std::vector<RenderFrameHostImpl*> child_frame_hosts; |
+ FrameAccessibility::GetInstance()->GetAllChildFrames( |
+ this, &child_frame_hosts); |
+ for (size_t i = 0; i < child_frame_hosts.size(); ++i) { |
+ RenderFrameHostImpl* child_frame_host = child_frame_hosts[i]; |
+ if (!child_frame_host || IsSameSiteInstance(child_frame_host)) |
+ continue; |
- return child_frame->GetOrCreateBrowserAccessibilityManager(); |
+ BrowserAccessibilityManager* manager = |
+ child_frame_host->GetOrCreateBrowserAccessibilityManager(); |
+ if (manager) |
+ child_frames->push_back(manager); |
+ } |
} |
BrowserAccessibility* RenderFrameHostImpl::AccessibilityGetParentFrame() { |
@@ -1481,6 +1485,14 @@ void RenderFrameHostImpl::UpdateGuestFrameAccessibility( |
} |
} |
+bool RenderFrameHostImpl::IsSameSiteInstance( |
+ RenderFrameHostImpl* other_render_frame_host) { |
+ // As a sanity check, make sure the frame belongs to the same BrowserContext. |
+ CHECK_EQ(GetSiteInstance()->GetBrowserContext(), |
+ child_frame->GetSiteInstance()->GetBrowserContext()); |
+ return GetSiteInstance() == other_render_frame_host->GetSiteInstance(); |
+} |
+ |
void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) { |
Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode)); |
} |