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 2537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2548 const blink::WebString& selector, | 2548 const blink::WebString& selector, |
2549 const blink::WebString& markup, | 2549 const blink::WebString& markup, |
2550 const blink::WebVector<blink::WebString>& web_names, | 2550 const blink::WebVector<blink::WebString>& web_names, |
2551 const blink::WebVector<blink::WebRect>& web_rects) { | 2551 const blink::WebVector<blink::WebRect>& web_rects) { |
2552 FrameHostMsg_AddNavigationTransitionData_Params params; | 2552 FrameHostMsg_AddNavigationTransitionData_Params params; |
2553 params.render_frame_id = routing_id_; | 2553 params.render_frame_id = routing_id_; |
2554 params.allowed_destination_host_pattern = | 2554 params.allowed_destination_host_pattern = |
2555 allowed_destination_host_pattern.utf8(); | 2555 allowed_destination_host_pattern.utf8(); |
2556 params.selector = selector.utf8(); | 2556 params.selector = selector.utf8(); |
2557 params.markup = markup.utf8(); | 2557 params.markup = markup.utf8(); |
| 2558 params.elements.resize(web_names.size()); |
2558 for (size_t i = 0; i < web_names.size(); i++) { | 2559 for (size_t i = 0; i < web_names.size(); i++) { |
2559 params.names.push_back(web_names[i].utf8()); | 2560 params.elements[i].name = web_names[i].utf8(); |
2560 } | 2561 params.elements[i].rect = gfx::Rect(web_rects[i]); |
2561 for (size_t i = 0; i < web_rects.size(); i++) { | |
2562 params.rects.push_back(gfx::Rect(web_rects[i])); | |
2563 } | 2562 } |
2564 | 2563 |
2565 Send(new FrameHostMsg_AddNavigationTransitionData(params)); | 2564 Send(new FrameHostMsg_AddNavigationTransitionData(params)); |
2566 } | 2565 } |
2567 | 2566 |
2568 void RenderFrameImpl::didChangeThemeColor() { | 2567 void RenderFrameImpl::didChangeThemeColor() { |
2569 if (frame_->parent()) | 2568 if (frame_->parent()) |
2570 return; | 2569 return; |
2571 | 2570 |
2572 Send(new FrameHostMsg_DidChangeThemeColor( | 2571 Send(new FrameHostMsg_DidChangeThemeColor( |
(...skipping 1576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4149 | 4148 |
4150 #if defined(ENABLE_BROWSER_CDMS) | 4149 #if defined(ENABLE_BROWSER_CDMS) |
4151 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4150 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
4152 if (!cdm_manager_) | 4151 if (!cdm_manager_) |
4153 cdm_manager_ = new RendererCdmManager(this); | 4152 cdm_manager_ = new RendererCdmManager(this); |
4154 return cdm_manager_; | 4153 return cdm_manager_; |
4155 } | 4154 } |
4156 #endif // defined(ENABLE_BROWSER_CDMS) | 4155 #endif // defined(ENABLE_BROWSER_CDMS) |
4157 | 4156 |
4158 } // namespace content | 4157 } // namespace content |
OLD | NEW |