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

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: Add EXPECT_TRUE to NavigateToURL in new tests; nits 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 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after
1336 IPC_END_MESSAGE_MAP() 1336 IPC_END_MESSAGE_MAP()
1337 return handled; 1337 return handled;
1338 } 1338 }
1339 1339
1340 void RenderThreadImpl::OnCreateNewFrame(int routing_id, 1340 void RenderThreadImpl::OnCreateNewFrame(int routing_id,
1341 int parent_routing_id, 1341 int parent_routing_id,
1342 int proxy_routing_id) { 1342 int proxy_routing_id) {
1343 RenderFrameImpl::CreateFrame(routing_id, parent_routing_id, proxy_routing_id); 1343 RenderFrameImpl::CreateFrame(routing_id, parent_routing_id, proxy_routing_id);
1344 } 1344 }
1345 1345
1346 void RenderThreadImpl::OnCreateNewFrameProxy(int routing_id, 1346 void RenderThreadImpl::OnCreateNewFrameProxy(
1347 int parent_routing_id, 1347 int routing_id,
1348 int render_view_routing_id) { 1348 int parent_routing_id,
1349 RenderFrameProxy::CreateFrameProxy( 1349 int render_view_routing_id,
1350 routing_id, parent_routing_id, render_view_routing_id); 1350 const FrameReplicationState& replicated_state) {
1351 RenderFrameProxy::CreateFrameProxy(routing_id, parent_routing_id,
1352 render_view_routing_id, replicated_state);
1351 } 1353 }
1352 1354
1353 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, 1355 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme,
1354 const std::string& host, 1356 const std::string& host,
1355 double zoom_level) { 1357 double zoom_level) {
1356 RenderViewZoomer zoomer(scheme, host, zoom_level); 1358 RenderViewZoomer zoomer(scheme, host, zoom_level);
1357 RenderView::ForEach(&zoomer); 1359 RenderView::ForEach(&zoomer);
1358 } 1360 }
1359 1361
1360 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { 1362 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) {
1361 EnsureWebKitInitialized(); 1363 EnsureWebKitInitialized();
1362 // When bringing in render_view, also bring in webkit's glue and jsbindings. 1364 // When bringing in render_view, also bring in webkit's glue and jsbindings.
1363 RenderViewImpl::Create(params.opener_route_id, 1365 RenderViewImpl::Create(params.opener_route_id,
1364 params.window_was_created_with_opener, 1366 params.window_was_created_with_opener,
1365 params.renderer_preferences, 1367 params.renderer_preferences,
1366 params.web_preferences, 1368 params.web_preferences,
1367 params.view_id, 1369 params.view_id,
1368 params.main_frame_routing_id, 1370 params.main_frame_routing_id,
1369 params.surface_id, 1371 params.surface_id,
1370 params.session_storage_namespace_id, 1372 params.session_storage_namespace_id,
1371 params.frame_name, 1373 params.frame_name,
1372 false, 1374 false,
1373 params.swapped_out, 1375 params.swapped_out,
1376 params.remote_frame_state,
1374 params.proxy_routing_id, 1377 params.proxy_routing_id,
1375 params.hidden, 1378 params.hidden,
1376 params.never_visible, 1379 params.never_visible,
1377 params.next_page_id, 1380 params.next_page_id,
1378 params.initial_size, 1381 params.initial_size,
1379 params.enable_auto_resize, 1382 params.enable_auto_resize,
1380 params.min_size, 1383 params.min_size,
1381 params.max_size); 1384 params.max_size);
1382 } 1385 }
1383 1386
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1626 hidden_widget_count_--; 1629 hidden_widget_count_--;
1627 1630
1628 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { 1631 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
1629 return; 1632 return;
1630 } 1633 }
1631 1634
1632 ScheduleIdleHandler(kLongIdleHandlerDelayMs); 1635 ScheduleIdleHandler(kLongIdleHandlerDelayMs);
1633 } 1636 }
1634 1637
1635 } // namespace content 1638 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698