OLD | NEW |
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_manager.h" | 5 #include "content/browser/frame_host/render_frame_host_manager.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 response_started_id_.reset(new GlobalRequestID(global_request_id)); | 366 response_started_id_.reset(new GlobalRequestID(global_request_id)); |
367 } | 367 } |
368 | 368 |
369 void RenderFrameHostManager::ResumeResponseDeferredAtStart() { | 369 void RenderFrameHostManager::ResumeResponseDeferredAtStart() { |
370 DCHECK(response_started_id_.get()); | 370 DCHECK(response_started_id_.get()); |
371 | 371 |
372 RenderProcessHostImpl* process = | 372 RenderProcessHostImpl* process = |
373 static_cast<RenderProcessHostImpl*>(render_frame_host_->GetProcess()); | 373 static_cast<RenderProcessHostImpl*>(render_frame_host_->GetProcess()); |
374 process->ResumeResponseDeferredAtStart(*response_started_id_); | 374 process->ResumeResponseDeferredAtStart(*response_started_id_); |
375 | 375 |
376 render_frame_host_->SetHasPendingTransitionRequest(false); | 376 render_frame_host_->ClearPendingTransitionRequestData(); |
377 | 377 |
378 response_started_id_.reset(); | 378 response_started_id_.reset(); |
379 } | 379 } |
380 | 380 |
381 void RenderFrameHostManager::SwappedOut( | 381 void RenderFrameHostManager::SwappedOut( |
382 RenderFrameHostImpl* render_frame_host) { | 382 RenderFrameHostImpl* render_frame_host) { |
383 // Make sure this is from our current RFH, and that we have a pending | 383 // Make sure this is from our current RFH, and that we have a pending |
384 // navigation from OnCrossSiteResponse. (There may be no pending navigation | 384 // navigation from OnCrossSiteResponse. (There may be no pending navigation |
385 // for data URLs that don't make network requests, for example.) If not, | 385 // for data URLs that don't make network requests, for example.) If not, |
386 // just return early and ignore. | 386 // just return early and ignore. |
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1506 SiteInstance* instance) const { | 1506 SiteInstance* instance) const { |
1507 RenderFrameProxyHostMap::const_iterator iter = | 1507 RenderFrameProxyHostMap::const_iterator iter = |
1508 proxy_hosts_.find(instance->GetId()); | 1508 proxy_hosts_.find(instance->GetId()); |
1509 if (iter != proxy_hosts_.end()) | 1509 if (iter != proxy_hosts_.end()) |
1510 return iter->second; | 1510 return iter->second; |
1511 | 1511 |
1512 return NULL; | 1512 return NULL; |
1513 } | 1513 } |
1514 | 1514 |
1515 } // namespace content | 1515 } // namespace content |
OLD | NEW |