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 2770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2781 blink::WebLocalFrame* source_frame, | 2781 blink::WebLocalFrame* source_frame, |
2782 blink::WebFrame* target_frame, | 2782 blink::WebFrame* target_frame, |
2783 blink::WebSecurityOrigin target_origin, | 2783 blink::WebSecurityOrigin target_origin, |
2784 blink::WebDOMMessageEvent event) { | 2784 blink::WebDOMMessageEvent event) { |
2785 DCHECK(!frame_ || frame_ == target_frame); | 2785 DCHECK(!frame_ || frame_ == target_frame); |
2786 | 2786 |
2787 if (!render_view_->is_swapped_out_) | 2787 if (!render_view_->is_swapped_out_) |
2788 return false; | 2788 return false; |
2789 | 2789 |
2790 ViewMsg_PostMessage_Params params; | 2790 ViewMsg_PostMessage_Params params; |
| 2791 params.is_data_raw_string = false; |
2791 params.data = event.data().toString(); | 2792 params.data = event.data().toString(); |
2792 params.source_origin = event.origin(); | 2793 params.source_origin = event.origin(); |
2793 if (!target_origin.isNull()) | 2794 if (!target_origin.isNull()) |
2794 params.target_origin = target_origin.toString(); | 2795 params.target_origin = target_origin.toString(); |
2795 | 2796 |
2796 blink::WebMessagePortChannelArray channels = event.releaseChannels(); | 2797 blink::WebMessagePortChannelArray channels = event.releaseChannels(); |
2797 if (!channels.isEmpty()) { | 2798 if (!channels.isEmpty()) { |
2798 std::vector<int> message_port_ids(channels.size()); | 2799 std::vector<int> message_port_ids(channels.size()); |
2799 // Extract the port IDs from the channel array. | 2800 // Extract the port IDs from the channel array. |
2800 for (size_t i = 0; i < channels.size(); ++i) { | 2801 for (size_t i = 0; i < channels.size(); ++i) { |
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3571 | 3572 |
3572 #if defined(ENABLE_BROWSER_CDMS) | 3573 #if defined(ENABLE_BROWSER_CDMS) |
3573 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3574 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
3574 if (!cdm_manager_) | 3575 if (!cdm_manager_) |
3575 cdm_manager_ = new RendererCdmManager(this); | 3576 cdm_manager_ = new RendererCdmManager(this); |
3576 return cdm_manager_; | 3577 return cdm_manager_; |
3577 } | 3578 } |
3578 #endif // defined(ENABLE_BROWSER_CDMS) | 3579 #endif // defined(ENABLE_BROWSER_CDMS) |
3579 | 3580 |
3580 } // namespace content | 3581 } // namespace content |
OLD | NEW |