OLD | NEW |
---|---|
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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2263 DCHECK(frame_); | 2263 DCHECK(frame_); |
2264 frame_->SetFrameOwnerProperties( | 2264 frame_->SetFrameOwnerProperties( |
2265 ConvertFrameOwnerPropertiesToWebFrameOwnerProperties( | 2265 ConvertFrameOwnerPropertiesToWebFrameOwnerProperties( |
2266 frame_owner_properties)); | 2266 frame_owner_properties)); |
2267 } | 2267 } |
2268 | 2268 |
2269 void RenderFrameImpl::OnAdvanceFocus(blink::WebFocusType type, | 2269 void RenderFrameImpl::OnAdvanceFocus(blink::WebFocusType type, |
2270 int32_t source_routing_id) { | 2270 int32_t source_routing_id) { |
2271 RenderFrameProxy* source_frame = | 2271 RenderFrameProxy* source_frame = |
2272 RenderFrameProxy::FromRoutingID(source_routing_id); | 2272 RenderFrameProxy::FromRoutingID(source_routing_id); |
2273 if (!source_frame) | 2273 if (!source_frame) { |
2274 render_view_->webview()->SetInitialFocus(type == | |
2275 blink::kWebFocusTypeBackward); | |
2274 return; | 2276 return; |
2277 } | |
2275 | 2278 |
2279 LOG(ERROR) << this << "->RenderFrameImpl::OnAdvanceFocus()"; | |
dmazzoni
2017/06/21 20:18:21
Remove this before submit!
| |
2276 render_view_->webview()->AdvanceFocusAcrossFrames( | 2280 render_view_->webview()->AdvanceFocusAcrossFrames( |
2277 type, source_frame->web_frame(), frame_); | 2281 type, source_frame->web_frame(), frame_); |
2278 } | 2282 } |
2279 | 2283 |
2280 void RenderFrameImpl::OnSetFocusedFrame() { | 2284 void RenderFrameImpl::OnSetFocusedFrame() { |
2281 // This uses focusDocumentView rather than setFocusedFrame so that focus/blur | 2285 // This uses focusDocumentView rather than setFocusedFrame so that focus/blur |
2282 // events are properly dispatched on any currently focused elements. | 2286 // events are properly dispatched on any currently focused elements. |
2283 render_view_->webview()->FocusDocumentView(frame_); | 2287 render_view_->webview()->FocusDocumentView(frame_); |
2284 } | 2288 } |
2285 | 2289 |
(...skipping 4576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6862 policy(info.default_policy), | 6866 policy(info.default_policy), |
6863 replaces_current_history_item(info.replaces_current_history_item), | 6867 replaces_current_history_item(info.replaces_current_history_item), |
6864 history_navigation_in_new_child_frame( | 6868 history_navigation_in_new_child_frame( |
6865 info.is_history_navigation_in_new_child_frame), | 6869 info.is_history_navigation_in_new_child_frame), |
6866 client_redirect(info.is_client_redirect), | 6870 client_redirect(info.is_client_redirect), |
6867 cache_disabled(info.is_cache_disabled), | 6871 cache_disabled(info.is_cache_disabled), |
6868 form(info.form), | 6872 form(info.form), |
6869 source_location(info.source_location) {} | 6873 source_location(info.source_location) {} |
6870 | 6874 |
6871 } // namespace content | 6875 } // namespace content |
OLD | NEW |