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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 2503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2514 const blink::WebString& selector, | 2514 const blink::WebString& selector, |
2515 const blink::WebString& markup, | 2515 const blink::WebString& markup, |
2516 const blink::WebVector<blink::WebString>& web_names, | 2516 const blink::WebVector<blink::WebString>& web_names, |
2517 const blink::WebVector<blink::WebRect>& web_rects) { | 2517 const blink::WebVector<blink::WebRect>& web_rects) { |
2518 FrameHostMsg_AddNavigationTransitionData_Params params; | 2518 FrameHostMsg_AddNavigationTransitionData_Params params; |
2519 params.render_frame_id = routing_id_; | 2519 params.render_frame_id = routing_id_; |
2520 params.allowed_destination_host_pattern = | 2520 params.allowed_destination_host_pattern = |
2521 allowed_destination_host_pattern.utf8(); | 2521 allowed_destination_host_pattern.utf8(); |
2522 params.selector = selector.utf8(); | 2522 params.selector = selector.utf8(); |
2523 params.markup = markup.utf8(); | 2523 params.markup = markup.utf8(); |
| 2524 params.elements.resize(web_names.size()); |
2524 for (size_t i = 0; i < web_names.size(); i++) { | 2525 for (size_t i = 0; i < web_names.size(); i++) { |
2525 params.names.push_back(web_names[i].utf8()); | 2526 params.elements[i].name = web_names[i].utf8(); |
2526 } | 2527 params.elements[i].rect = gfx::Rect(web_rects[i]); |
2527 for (size_t i = 0; i < web_rects.size(); i++) { | |
2528 params.rects.push_back(gfx::Rect(web_rects[i])); | |
2529 } | 2528 } |
2530 | 2529 |
2531 Send(new FrameHostMsg_AddNavigationTransitionData(params)); | 2530 Send(new FrameHostMsg_AddNavigationTransitionData(params)); |
2532 } | 2531 } |
2533 | 2532 |
2534 void RenderFrameImpl::didChangeThemeColor() { | 2533 void RenderFrameImpl::didChangeThemeColor() { |
2535 if (frame_->parent()) | 2534 if (frame_->parent()) |
2536 return; | 2535 return; |
2537 | 2536 |
2538 Send(new FrameHostMsg_DidChangeThemeColor( | 2537 Send(new FrameHostMsg_DidChangeThemeColor( |
(...skipping 1568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4107 | 4106 |
4108 #if defined(ENABLE_BROWSER_CDMS) | 4107 #if defined(ENABLE_BROWSER_CDMS) |
4109 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4108 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
4110 if (!cdm_manager_) | 4109 if (!cdm_manager_) |
4111 cdm_manager_ = new RendererCdmManager(this); | 4110 cdm_manager_ = new RendererCdmManager(this); |
4112 return cdm_manager_; | 4111 return cdm_manager_; |
4113 } | 4112 } |
4114 #endif // defined(ENABLE_BROWSER_CDMS) | 4113 #endif // defined(ENABLE_BROWSER_CDMS) |
4115 | 4114 |
4116 } // namespace content | 4115 } // namespace content |
OLD | NEW |