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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2674353003: Enable WebViewAccessiblityTest for OOPIF webview. (Closed)
Patch Set: Address dmazzoni comments. Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 3307 matching lines...) Expand 10 before | Expand all | Expand 10 after
3318 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 3318 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
3319 3319
3320 if (browser_plugin_embedder_ax_tree_id_ != AXTreeIDRegistry::kNoAXTreeID) 3320 if (browser_plugin_embedder_ax_tree_id_ != AXTreeIDRegistry::kNoAXTreeID)
3321 dst->parent_tree_id = browser_plugin_embedder_ax_tree_id_; 3321 dst->parent_tree_id = browser_plugin_embedder_ax_tree_id_;
3322 3322
3323 // If this is not the root frame tree node, we're done. 3323 // If this is not the root frame tree node, we're done.
3324 if (frame_tree_node()->parent()) 3324 if (frame_tree_node()->parent())
3325 return; 3325 return;
3326 3326
3327 // For the root frame tree node, also store the AXTreeID of the focused frame. 3327 // For the root frame tree node, also store the AXTreeID of the focused frame.
3328 // TODO(avallee): https://crbug.com/610795: No focus ax events. 3328 auto* focused_frame = static_cast<RenderFrameHostImpl*>(
3329 // This is probably where we need to fix the bug to enable the test. 3329 delegate_->GetFocusedFrameIncludingInnerWebContents());
3330 FrameTreeNode* focused_frame_tree_node = frame_tree_->GetFocusedFrame(); 3330 if (!focused_frame)
3331 if (!focused_frame_tree_node)
3332 return; 3331 return;
3333 RenderFrameHostImpl* focused_frame =
3334 focused_frame_tree_node->current_frame_host();
3335 DCHECK(focused_frame);
3336 dst->focused_tree_id = focused_frame->GetAXTreeID(); 3332 dst->focused_tree_id = focused_frame->GetAXTreeID();
3337 } 3333 }
3338 3334
3339 WebBluetoothServiceImpl* RenderFrameHostImpl::CreateWebBluetoothService( 3335 WebBluetoothServiceImpl* RenderFrameHostImpl::CreateWebBluetoothService(
3340 blink::mojom::WebBluetoothServiceRequest request) { 3336 blink::mojom::WebBluetoothServiceRequest request) {
3341 // RFHI owns |web_bluetooth_services_| and |web_bluetooth_service| owns the 3337 // RFHI owns |web_bluetooth_services_| and |web_bluetooth_service| owns the
3342 // |binding_| which may run the error handler. |binding_| can't run the error 3338 // |binding_| which may run the error handler. |binding_| can't run the error
3343 // handler after it's destroyed so it can't run after the RFHI is destroyed. 3339 // handler after it's destroyed so it can't run after the RFHI is destroyed.
3344 auto web_bluetooth_service = 3340 auto web_bluetooth_service =
3345 base::MakeUnique<WebBluetoothServiceImpl>(this, std::move(request)); 3341 base::MakeUnique<WebBluetoothServiceImpl>(this, std::move(request));
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
3455 // There is no pending NavigationEntry in these cases, so pass 0 as the 3451 // There is no pending NavigationEntry in these cases, so pass 0 as the
3456 // pending_nav_entry_id. If the previous handle was a prematurely aborted 3452 // pending_nav_entry_id. If the previous handle was a prematurely aborted
3457 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. 3453 // navigation loaded via LoadDataWithBaseURL, propagate the entry id.
3458 return NavigationHandleImpl::Create( 3454 return NavigationHandleImpl::Create(
3459 params.url, frame_tree_node_, is_renderer_initiated, 3455 params.url, frame_tree_node_, is_renderer_initiated,
3460 params.was_within_same_page, base::TimeTicks::Now(), 3456 params.was_within_same_page, base::TimeTicks::Now(),
3461 entry_id_for_data_nav, false); // started_from_context_menu 3457 entry_id_for_data_nav, false); // started_from_context_menu
3462 } 3458 }
3463 3459
3464 } // namespace content 3460 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698