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 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 | 397 |
398 RenderProcessHostImpl* process = | 398 RenderProcessHostImpl* process = |
399 static_cast<RenderProcessHostImpl*>(render_frame_host_->GetProcess()); | 399 static_cast<RenderProcessHostImpl*>(render_frame_host_->GetProcess()); |
400 process->ResumeResponseDeferredAtStart(*response_started_id_); | 400 process->ResumeResponseDeferredAtStart(*response_started_id_); |
401 | 401 |
402 render_frame_host_->ClearPendingTransitionRequestData(); | 402 render_frame_host_->ClearPendingTransitionRequestData(); |
403 | 403 |
404 response_started_id_.reset(); | 404 response_started_id_.reset(); |
405 } | 405 } |
406 | 406 |
| 407 void RenderFrameHostManager::ClearNavigationTransitionData() { |
| 408 render_frame_host_->ClearPendingTransitionRequestData(); |
| 409 } |
| 410 |
407 void RenderFrameHostManager::DidNavigateFrame( | 411 void RenderFrameHostManager::DidNavigateFrame( |
408 RenderFrameHostImpl* render_frame_host) { | 412 RenderFrameHostImpl* render_frame_host) { |
409 if (!cross_navigation_pending_) { | 413 if (!cross_navigation_pending_) { |
410 DCHECK(!pending_render_frame_host_); | 414 DCHECK(!pending_render_frame_host_); |
411 | 415 |
412 // We should only hear this from our current renderer. | 416 // We should only hear this from our current renderer. |
413 DCHECK_EQ(render_frame_host_, render_frame_host); | 417 DCHECK_EQ(render_frame_host_, render_frame_host); |
414 | 418 |
415 // Even when there is no pending RVH, there may be a pending Web UI. | 419 // Even when there is no pending RVH, there may be a pending Web UI. |
416 if (pending_web_ui()) | 420 if (pending_web_ui()) |
(...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1607 void RenderFrameHostManager::DeleteRenderFrameProxyHost( | 1611 void RenderFrameHostManager::DeleteRenderFrameProxyHost( |
1608 SiteInstance* instance) { | 1612 SiteInstance* instance) { |
1609 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); | 1613 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); |
1610 if (iter != proxy_hosts_.end()) { | 1614 if (iter != proxy_hosts_.end()) { |
1611 delete iter->second; | 1615 delete iter->second; |
1612 proxy_hosts_.erase(iter); | 1616 proxy_hosts_.erase(iter); |
1613 } | 1617 } |
1614 } | 1618 } |
1615 | 1619 |
1616 } // namespace content | 1620 } // namespace content |
OLD | NEW |