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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 332693004: Add a content API for postMessage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: get rid of json. plain string is fine. Created 6 years, 6 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 | Annotate | Revision Log
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/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 2784 matching lines...) Expand 10 before | Expand all | Expand 10 after
2795 blink::WebLocalFrame* source_frame, 2795 blink::WebLocalFrame* source_frame,
2796 blink::WebFrame* target_frame, 2796 blink::WebFrame* target_frame,
2797 blink::WebSecurityOrigin target_origin, 2797 blink::WebSecurityOrigin target_origin,
2798 blink::WebDOMMessageEvent event) { 2798 blink::WebDOMMessageEvent event) {
2799 DCHECK(!frame_ || frame_ == target_frame); 2799 DCHECK(!frame_ || frame_ == target_frame);
2800 2800
2801 if (!render_view_->is_swapped_out_) 2801 if (!render_view_->is_swapped_out_)
2802 return false; 2802 return false;
2803 2803
2804 ViewMsg_PostMessage_Params params; 2804 ViewMsg_PostMessage_Params params;
2805 params.is_data_raw_string = false;
2805 params.data = event.data().toString(); 2806 params.data = event.data().toString();
2806 params.source_origin = event.origin(); 2807 params.source_origin = event.origin();
2807 if (!target_origin.isNull()) 2808 if (!target_origin.isNull())
2808 params.target_origin = target_origin.toString(); 2809 params.target_origin = target_origin.toString();
2809 2810
2810 blink::WebMessagePortChannelArray channels = event.releaseChannels(); 2811 blink::WebMessagePortChannelArray channels = event.releaseChannels();
2811 if (!channels.isEmpty()) { 2812 if (!channels.isEmpty()) {
2812 std::vector<int> message_port_ids(channels.size()); 2813 std::vector<int> message_port_ids(channels.size());
2813 // Extract the port IDs from the channel array. 2814 // Extract the port IDs from the channel array.
2814 for (size_t i = 0; i < channels.size(); ++i) { 2815 for (size_t i = 0; i < channels.size(); ++i) {
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after
3581 3582
3582 #if defined(ENABLE_BROWSER_CDMS) 3583 #if defined(ENABLE_BROWSER_CDMS)
3583 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3584 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3584 if (!cdm_manager_) 3585 if (!cdm_manager_)
3585 cdm_manager_ = new RendererCdmManager(this); 3586 cdm_manager_ = new RendererCdmManager(this);
3586 return cdm_manager_; 3587 return cdm_manager_;
3587 } 3588 }
3588 #endif // defined(ENABLE_BROWSER_CDMS) 3589 #endif // defined(ENABLE_BROWSER_CDMS)
3589 3590
3590 } // namespace content 3591 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698