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

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

Issue 692973005: Pass origin information for remote frame creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review feedback; send origins with DidCommitProvisionalLoad 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_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after
1306 IPC_END_MESSAGE_MAP() 1306 IPC_END_MESSAGE_MAP()
1307 return handled; 1307 return handled;
1308 } 1308 }
1309 1309
1310 void RenderThreadImpl::OnCreateNewFrame(int routing_id, 1310 void RenderThreadImpl::OnCreateNewFrame(int routing_id,
1311 int parent_routing_id, 1311 int parent_routing_id,
1312 int proxy_routing_id) { 1312 int proxy_routing_id) {
1313 RenderFrameImpl::CreateFrame(routing_id, parent_routing_id, proxy_routing_id); 1313 RenderFrameImpl::CreateFrame(routing_id, parent_routing_id, proxy_routing_id);
1314 } 1314 }
1315 1315
1316 void RenderThreadImpl::OnCreateNewFrameProxy(int routing_id, 1316 void RenderThreadImpl::OnCreateNewFrameProxy(
1317 int parent_routing_id, 1317 int routing_id,
1318 int render_view_routing_id) { 1318 int parent_routing_id,
1319 int render_view_routing_id,
1320 const FrameReplicationState& replicated_state) {
1319 RenderFrameProxy::CreateFrameProxy( 1321 RenderFrameProxy::CreateFrameProxy(
1320 routing_id, parent_routing_id, render_view_routing_id); 1322 routing_id, parent_routing_id, render_view_routing_id, replicated_state);
1321 } 1323 }
1322 1324
1323 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, 1325 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme,
1324 const std::string& host, 1326 const std::string& host,
1325 double zoom_level) { 1327 double zoom_level) {
1326 RenderViewZoomer zoomer(scheme, host, zoom_level); 1328 RenderViewZoomer zoomer(scheme, host, zoom_level);
1327 RenderView::ForEach(&zoomer); 1329 RenderView::ForEach(&zoomer);
1328 } 1330 }
1329 1331
1330 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { 1332 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) {
1331 EnsureWebKitInitialized(); 1333 EnsureWebKitInitialized();
1332 // When bringing in render_view, also bring in webkit's glue and jsbindings. 1334 // When bringing in render_view, also bring in webkit's glue and jsbindings.
1333 RenderViewImpl::Create(params.opener_route_id, 1335 RenderViewImpl::Create(params.opener_route_id,
1334 params.window_was_created_with_opener, 1336 params.window_was_created_with_opener,
1335 params.renderer_preferences, 1337 params.renderer_preferences,
1336 params.web_preferences, 1338 params.web_preferences,
1337 params.view_id, 1339 params.view_id,
1338 params.main_frame_routing_id, 1340 params.main_frame_routing_id,
1339 params.surface_id, 1341 params.surface_id,
1340 params.session_storage_namespace_id, 1342 params.session_storage_namespace_id,
1341 params.frame_name, 1343 params.frame_name,
1342 false, 1344 false,
1343 params.swapped_out, 1345 params.swapped_out,
1346 params.remote_frame_state,
1344 params.proxy_routing_id, 1347 params.proxy_routing_id,
1345 params.hidden, 1348 params.hidden,
1346 params.never_visible, 1349 params.never_visible,
1347 params.next_page_id, 1350 params.next_page_id,
1348 params.screen_info); 1351 params.screen_info);
1349 } 1352 }
1350 1353
1351 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( 1354 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync(
1352 CauseForGpuLaunch cause_for_gpu_launch) { 1355 CauseForGpuLaunch cause_for_gpu_launch) {
1353 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); 1356 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync");
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1593 hidden_widget_count_--; 1596 hidden_widget_count_--;
1594 1597
1595 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { 1598 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
1596 return; 1599 return;
1597 } 1600 }
1598 1601
1599 ScheduleIdleHandler(kLongIdleHandlerDelayMs); 1602 ScheduleIdleHandler(kLongIdleHandlerDelayMs);
1600 } 1603 }
1601 1604
1602 } // namespace content 1605 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698