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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2722893002: Remove unused member in RenderFrameHostImpl. (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 FrameTree* frame_tree, 310 FrameTree* frame_tree,
311 FrameTreeNode* frame_tree_node, 311 FrameTreeNode* frame_tree_node,
312 int32_t routing_id, 312 int32_t routing_id,
313 int32_t widget_routing_id, 313 int32_t widget_routing_id,
314 bool hidden, 314 bool hidden,
315 bool renderer_initiated_creation) 315 bool renderer_initiated_creation)
316 : render_view_host_(render_view_host), 316 : render_view_host_(render_view_host),
317 delegate_(delegate), 317 delegate_(delegate),
318 site_instance_(static_cast<SiteInstanceImpl*>(site_instance)), 318 site_instance_(static_cast<SiteInstanceImpl*>(site_instance)),
319 process_(site_instance->GetProcess()), 319 process_(site_instance->GetProcess()),
320 render_frame_proxy_host_(NULL),
321 frame_tree_(frame_tree), 320 frame_tree_(frame_tree),
322 frame_tree_node_(frame_tree_node), 321 frame_tree_node_(frame_tree_node),
323 parent_(nullptr), 322 parent_(nullptr),
324 render_widget_host_(nullptr), 323 render_widget_host_(nullptr),
325 routing_id_(routing_id), 324 routing_id_(routing_id),
326 is_waiting_for_swapout_ack_(false), 325 is_waiting_for_swapout_ack_(false),
327 render_frame_created_(false), 326 render_frame_created_(false),
328 navigations_suspended_(false), 327 navigations_suspended_(false),
329 is_waiting_for_beforeunload_ack_(false), 328 is_waiting_for_beforeunload_ack_(false),
330 unload_ack_is_for_navigation_(false), 329 unload_ack_is_for_navigation_(false),
(...skipping 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after
1376 if (swapout_event_monitor_timeout_) { 1375 if (swapout_event_monitor_timeout_) {
1377 swapout_event_monitor_timeout_->Start(base::TimeDelta::FromMilliseconds( 1376 swapout_event_monitor_timeout_->Start(base::TimeDelta::FromMilliseconds(
1378 RenderViewHostImpl::kUnloadTimeoutMS)); 1377 RenderViewHostImpl::kUnloadTimeoutMS));
1379 } 1378 }
1380 1379
1381 // There should always be a proxy to replace the old RenderFrameHost. If 1380 // There should always be a proxy to replace the old RenderFrameHost. If
1382 // there are no remaining active views in the process, the proxy will be 1381 // there are no remaining active views in the process, the proxy will be
1383 // short-lived and will be deleted when the SwapOut ACK is received. 1382 // short-lived and will be deleted when the SwapOut ACK is received.
1384 CHECK(proxy); 1383 CHECK(proxy);
1385 1384
1386 set_render_frame_proxy_host(proxy);
1387
1388 if (IsRenderFrameLive()) { 1385 if (IsRenderFrameLive()) {
1389 FrameReplicationState replication_state = 1386 FrameReplicationState replication_state =
1390 proxy->frame_tree_node()->current_replication_state(); 1387 proxy->frame_tree_node()->current_replication_state();
1391 Send(new FrameMsg_SwapOut(routing_id_, proxy->GetRoutingID(), is_loading, 1388 Send(new FrameMsg_SwapOut(routing_id_, proxy->GetRoutingID(), is_loading,
1392 replication_state)); 1389 replication_state));
1393 } 1390 }
1394 1391
1395 if (web_ui()) 1392 if (web_ui())
1396 web_ui()->RenderFrameHostSwappingOut(); 1393 web_ui()->RenderFrameHostSwappingOut();
1397 1394
(...skipping 2061 matching lines...) Expand 10 before | Expand all | Expand 10 after
3459 // There is no pending NavigationEntry in these cases, so pass 0 as the 3456 // There is no pending NavigationEntry in these cases, so pass 0 as the
3460 // pending_nav_entry_id. If the previous handle was a prematurely aborted 3457 // pending_nav_entry_id. If the previous handle was a prematurely aborted
3461 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. 3458 // navigation loaded via LoadDataWithBaseURL, propagate the entry id.
3462 return NavigationHandleImpl::Create( 3459 return NavigationHandleImpl::Create(
3463 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, 3460 params.url, params.redirects, frame_tree_node_, is_renderer_initiated,
3464 params.was_within_same_page, base::TimeTicks::Now(), 3461 params.was_within_same_page, base::TimeTicks::Now(),
3465 entry_id_for_data_nav, false); // started_from_context_menu 3462 entry_id_for_data_nav, false); // started_from_context_menu
3466 } 3463 }
3467 3464
3468 } // namespace content 3465 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698