content/browser/frame_host/render_frame_host_impl.cc - Issue 387703004: Navigation transitions: Parse out transition-entering-stylesheet link headers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: more tests on java side 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 side-by-side diff with in-line comments

Download patch

« content/browser/android/content_view_core_impl.cc ('K') | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/loader/cross_site_resource_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_impl.cc

diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc

index 7e017ee531a34972b3d66a9fe2a053cabe0c95a1..53d2774808ed38a56e6efa4ca05abd7f5379d761 100644

--- a/content/browser/frame_host/render_frame_host_impl.cc

+++ b/content/browser/frame_host/render_frame_host_impl.cc

@@ -534,14 +534,15 @@ void RenderFrameHostImpl::OnCrossSiteResponse(

}

void RenderFrameHostImpl::OnDeferredAfterResponseStarted(

- const GlobalRequestID& global_request_id) {

+ const GlobalRequestID& global_request_id,

+ const TransitionLayerData& transition_layer_data) {

frame_tree_node_->render_manager()->OnDeferredAfterResponseStarted(

global_request_id, this);

if (GetParent() || !delegate_->WillHandleDeferAfterResponseStarted())

frame_tree_node_->render_manager()->ResumeResponseDeferredAtStart();

else

- delegate_->DidDeferAfterResponseStarted();

+ delegate_->DidDeferAfterResponseStarted(transition_layer_data);

}

void RenderFrameHostImpl::SwapOut(RenderFrameProxyHost* proxy) {