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

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

Issue 1144463003: Remove Navigation Transitions from Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed TransitionPageHelper. Created 5 years, 7 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
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_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/logging.h" 10 #include "base/logging.h"
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 pending_render_frame_host->frame_tree_node()->navigator()->RequestTransferURL( 416 pending_render_frame_host->frame_tree_node()->navigator()->RequestTransferURL(
417 pending_render_frame_host, transfer_url, nullptr, rest_of_chain, referrer, 417 pending_render_frame_host, transfer_url, nullptr, rest_of_chain, referrer,
418 page_transition, CURRENT_TAB, global_request_id, 418 page_transition, CURRENT_TAB, global_request_id,
419 should_replace_current_entry, true); 419 should_replace_current_entry, true);
420 420
421 // The transferring request was only needed during the RequestTransferURL 421 // The transferring request was only needed during the RequestTransferURL
422 // call, so it is safe to clear at this point. 422 // call, so it is safe to clear at this point.
423 cross_site_transferring_request_.reset(); 423 cross_site_transferring_request_.reset();
424 } 424 }
425 425
426 void RenderFrameHostManager::OnDeferredAfterResponseStarted(
427 const GlobalRequestID& global_request_id,
428 RenderFrameHostImpl* pending_render_frame_host) {
429 DCHECK(!response_started_id_);
430
431 response_started_id_.reset(new GlobalRequestID(global_request_id));
432 }
433
434 void RenderFrameHostManager::ResumeResponseDeferredAtStart() {
435 DCHECK(response_started_id_);
436
437 RenderProcessHostImpl* process =
438 static_cast<RenderProcessHostImpl*>(render_frame_host_->GetProcess());
439 process->ResumeResponseDeferredAtStart(*response_started_id_);
440
441 render_frame_host_->ClearPendingTransitionRequestData();
442
443 response_started_id_.reset();
444 }
445
446 void RenderFrameHostManager::ClearNavigationTransitionData() {
447 render_frame_host_->ClearPendingTransitionRequestData();
448 }
449
450 void RenderFrameHostManager::DidNavigateFrame( 426 void RenderFrameHostManager::DidNavigateFrame(
451 RenderFrameHostImpl* render_frame_host, 427 RenderFrameHostImpl* render_frame_host,
452 bool was_caused_by_user_gesture) { 428 bool was_caused_by_user_gesture) {
453 CommitPendingIfNecessary(render_frame_host, was_caused_by_user_gesture); 429 CommitPendingIfNecessary(render_frame_host, was_caused_by_user_gesture);
454 430
455 // Make sure any dynamic changes to this frame's sandbox flags that were made 431 // Make sure any dynamic changes to this frame's sandbox flags that were made
456 // prior to navigation take effect. 432 // prior to navigation take effect.
457 CommitPendingSandboxFlags(); 433 CommitPendingSandboxFlags();
458 } 434 }
459 435
(...skipping 1673 matching lines...) Expand 10 before | Expand all | Expand 10 after
2133 void RenderFrameHostManager::DeleteRenderFrameProxyHost( 2109 void RenderFrameHostManager::DeleteRenderFrameProxyHost(
2134 SiteInstance* instance) { 2110 SiteInstance* instance) {
2135 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); 2111 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId());
2136 if (iter != proxy_hosts_.end()) { 2112 if (iter != proxy_hosts_.end()) {
2137 delete iter->second; 2113 delete iter->second;
2138 proxy_hosts_.erase(iter); 2114 proxy_hosts_.erase(iter);
2139 } 2115 }
2140 } 2116 }
2141 2117
2142 } // namespace content 2118 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.h ('k') | content/browser/loader/cross_site_resource_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698