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

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

Issue 692973005: Pass origin information for remote frame creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Second round of feedback Created 6 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 CHECK(params->swapped_out); 763 CHECK(params->swapped_out);
764 proxy = RenderFrameProxy::CreateProxyToReplaceFrame( 764 proxy = RenderFrameProxy::CreateProxyToReplaceFrame(
765 main_render_frame_.get(), params->proxy_routing_id); 765 main_render_frame_.get(), params->proxy_routing_id);
766 main_render_frame_->set_render_frame_proxy(proxy); 766 main_render_frame_->set_render_frame_proxy(proxy);
767 } 767 }
768 768
769 // In --site-per-process, just use the WebRemoteFrame as the main frame. 769 // In --site-per-process, just use the WebRemoteFrame as the main frame.
770 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess) && 770 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess) &&
771 proxy) { 771 proxy) {
772 webview()->setMainFrame(proxy->web_frame()); 772 webview()->setMainFrame(proxy->web_frame());
773 // Initialize the WebRemoteFrame with information replicated from the
774 // browser process.
775 proxy->SetReplicatedState(params->remote_frame_state);
773 } else { 776 } else {
774 webview()->setMainFrame(main_render_frame_->GetWebFrame()); 777 webview()->setMainFrame(main_render_frame_->GetWebFrame());
775 } 778 }
776 main_render_frame_->Initialize(); 779 main_render_frame_->Initialize();
777 780
778 if (switches::IsTouchDragDropEnabled()) 781 if (switches::IsTouchDragDropEnabled())
779 webview()->settings()->setTouchDragDropEnabled(true); 782 webview()->settings()->setTouchDragDropEnabled(true);
780 783
781 if (switches::IsTouchEditingEnabled()) 784 if (switches::IsTouchEditingEnabled())
782 webview()->settings()->setTouchEditingEnabled(true); 785 webview()->settings()->setTouchEditingEnabled(true);
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
1131 bool window_was_created_with_opener, 1134 bool window_was_created_with_opener,
1132 const RendererPreferences& renderer_prefs, 1135 const RendererPreferences& renderer_prefs,
1133 const WebPreferences& webkit_prefs, 1136 const WebPreferences& webkit_prefs,
1134 int32 routing_id, 1137 int32 routing_id,
1135 int32 main_frame_routing_id, 1138 int32 main_frame_routing_id,
1136 int32 surface_id, 1139 int32 surface_id,
1137 int64 session_storage_namespace_id, 1140 int64 session_storage_namespace_id,
1138 const base::string16& frame_name, 1141 const base::string16& frame_name,
1139 bool is_renderer_created, 1142 bool is_renderer_created,
1140 bool swapped_out, 1143 bool swapped_out,
1144 const FrameReplicationState& remote_frame_state,
1141 int32 proxy_routing_id, 1145 int32 proxy_routing_id,
1142 bool hidden, 1146 bool hidden,
1143 bool never_visible, 1147 bool never_visible,
1144 int32 next_page_id, 1148 int32 next_page_id,
1145 const blink::WebScreenInfo& screen_info) { 1149 const blink::WebScreenInfo& screen_info) {
1146 DCHECK(routing_id != MSG_ROUTING_NONE); 1150 DCHECK(routing_id != MSG_ROUTING_NONE);
1147 RenderViewImplParams params(opener_id, 1151 RenderViewImplParams params(opener_id,
1148 window_was_created_with_opener, 1152 window_was_created_with_opener,
1149 renderer_prefs, 1153 renderer_prefs,
1150 webkit_prefs, 1154 webkit_prefs,
1151 routing_id, 1155 routing_id,
1152 main_frame_routing_id, 1156 main_frame_routing_id,
1153 surface_id, 1157 surface_id,
1154 session_storage_namespace_id, 1158 session_storage_namespace_id,
1155 frame_name, 1159 frame_name,
1156 is_renderer_created, 1160 is_renderer_created,
1157 swapped_out, 1161 swapped_out,
1162 remote_frame_state,
1158 proxy_routing_id, 1163 proxy_routing_id,
1159 hidden, 1164 hidden,
1160 never_visible, 1165 never_visible,
1161 next_page_id, 1166 next_page_id,
1162 screen_info); 1167 screen_info);
1163 RenderViewImpl* render_view = NULL; 1168 RenderViewImpl* render_view = NULL;
1164 if (g_create_render_view_impl) 1169 if (g_create_render_view_impl)
1165 render_view = g_create_render_view_impl(&params); 1170 render_view = g_create_render_view_impl(&params);
1166 else 1171 else
1167 render_view = new RenderViewImpl(&params); 1172 render_view = new RenderViewImpl(&params);
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
1682 true, // window_was_created_with_opener 1687 true, // window_was_created_with_opener
1683 renderer_preferences_, 1688 renderer_preferences_,
1684 webkit_preferences_, 1689 webkit_preferences_,
1685 routing_id, 1690 routing_id,
1686 main_frame_routing_id, 1691 main_frame_routing_id,
1687 surface_id, 1692 surface_id,
1688 cloned_session_storage_namespace_id, 1693 cloned_session_storage_namespace_id,
1689 base::string16(), // WebCore will take care of setting the correct name. 1694 base::string16(), // WebCore will take care of setting the correct name.
1690 true, // is_renderer_created 1695 true, // is_renderer_created
1691 false, // swapped_out 1696 false, // swapped_out
1697 FrameReplicationState(), // Empty since swapped_out is false.
1692 MSG_ROUTING_NONE, // proxy_routing_id 1698 MSG_ROUTING_NONE, // proxy_routing_id
1693 params.disposition == NEW_BACKGROUND_TAB, // hidden 1699 params.disposition == NEW_BACKGROUND_TAB, // hidden
1694 never_visible, 1700 never_visible,
1695 1, // next_page_id 1701 1, // next_page_id
1696 screen_info_); 1702 screen_info_);
1697 view->opened_by_user_gesture_ = params.user_gesture; 1703 view->opened_by_user_gesture_ = params.user_gesture;
1698 1704
1699 // Record whether the creator frame is trying to suppress the opener field. 1705 // Record whether the creator frame is trying to suppress the opener field.
1700 view->opener_suppressed_ = params.opener_suppressed; 1706 view->opener_suppressed_ = params.opener_suppressed;
1701 1707
(...skipping 2518 matching lines...) Expand 10 before | Expand all | Expand 10 after
4220 std::vector<gfx::Size> sizes; 4226 std::vector<gfx::Size> sizes;
4221 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4227 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4222 if (!url.isEmpty()) 4228 if (!url.isEmpty())
4223 urls.push_back( 4229 urls.push_back(
4224 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4230 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4225 } 4231 }
4226 SendUpdateFaviconURL(urls); 4232 SendUpdateFaviconURL(urls);
4227 } 4233 }
4228 4234
4229 } // namespace content 4235 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698