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

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

Issue 387703004: Navigation transitions: Parse out transition-entering-stylesheet link headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/containers/hash_tables.h" 8 #include "base/containers/hash_tables.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/metrics/user_metrics_action.h" 10 #include "base/metrics/user_metrics_action.h"
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 const Referrer& referrer, 525 const Referrer& referrer,
526 PageTransition page_transition, 526 PageTransition page_transition,
527 bool should_replace_current_entry) { 527 bool should_replace_current_entry) {
528 frame_tree_node_->render_manager()->OnCrossSiteResponse( 528 frame_tree_node_->render_manager()->OnCrossSiteResponse(
529 this, global_request_id, cross_site_transferring_request.Pass(), 529 this, global_request_id, cross_site_transferring_request.Pass(),
530 transfer_url_chain, referrer, page_transition, 530 transfer_url_chain, referrer, page_transition,
531 should_replace_current_entry); 531 should_replace_current_entry);
532 } 532 }
533 533
534 void RenderFrameHostImpl::OnDeferredAfterResponseStarted( 534 void RenderFrameHostImpl::OnDeferredAfterResponseStarted(
535 const GlobalRequestID& global_request_id) { 535 const GlobalRequestID& global_request_id,
536 const TransitionLayerData& transition_layer_data) {
536 frame_tree_node_->render_manager()->OnDeferredAfterResponseStarted( 537 frame_tree_node_->render_manager()->OnDeferredAfterResponseStarted(
537 global_request_id, this); 538 global_request_id, this);
538 539
539 if (GetParent() || !delegate_->WillHandleDeferAfterResponseStarted()) 540 if (GetParent() || !delegate_->WillHandleDeferAfterResponseStarted())
540 frame_tree_node_->render_manager()->ResumeResponseDeferredAtStart(); 541 frame_tree_node_->render_manager()->ResumeResponseDeferredAtStart();
541 else 542 else
542 delegate_->DidDeferAfterResponseStarted(); 543 delegate_->DidDeferAfterResponseStarted(transition_layer_data);
543 } 544 }
544 545
545 void RenderFrameHostImpl::SwapOut(RenderFrameProxyHost* proxy) { 546 void RenderFrameHostImpl::SwapOut(RenderFrameProxyHost* proxy) {
546 // TODO(creis): Move swapped out state to RFH. Until then, only update it 547 // TODO(creis): Move swapped out state to RFH. Until then, only update it
547 // when swapping out the main frame. 548 // when swapping out the main frame.
548 if (!GetParent()) { 549 if (!GetParent()) {
549 // If this RenderViewHost is not in the default state, it must have already 550 // If this RenderViewHost is not in the default state, it must have already
550 // gone through this, therefore just return. 551 // gone through this, therefore just return.
551 if (render_view_host_->rvh_state_ != RenderViewHostImpl::STATE_DEFAULT) 552 if (render_view_host_->rvh_state_ != RenderViewHostImpl::STATE_DEFAULT)
552 return; 553 return;
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 FROM_HERE, 945 FROM_HERE,
945 base::Bind( 946 base::Bind(
946 &TransitionRequestManager::SetHasPendingTransitionRequest, 947 &TransitionRequestManager::SetHasPendingTransitionRequest,
947 base::Unretained(TransitionRequestManager::GetInstance()), 948 base::Unretained(TransitionRequestManager::GetInstance()),
948 GetProcess()->GetID(), 949 GetProcess()->GetID(),
949 routing_id_, 950 routing_id_,
950 has_pending_request)); 951 has_pending_request));
951 } 952 }
952 953
953 } // namespace content 954 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698