content/browser/renderer_host/context_provider_factory_impl_android.cc - Issue 2656893003: Let DelegateFrameHost in Mac and Android use correct FrameSinkId during creation

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/renderer_host/context_provider_factory_impl_android.cc

Issue 2656893003: Let DelegateFrameHost in Mac and Android use correct FrameSinkId during creation (Closed)

Patch Set: fix android browser Created 3 years, 11 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

« no previous file with comments | « content/browser/renderer_host/context_provider_factory_impl_android.h ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/context_provider_factory_impl_android.cc

diff --git a/content/browser/renderer_host/context_provider_factory_impl_android.cc b/content/browser/renderer_host/context_provider_factory_impl_android.cc

index 8aa6a187e31cd8ce68d9d4cb3f3078c04d2b7f4e..5380c8beb461131aa51950829f139bdaa2112631 100644

--- a/content/browser/renderer_host/context_provider_factory_impl_android.cc

+++ b/content/browser/renderer_host/context_provider_factory_impl_android.cc

@@ -66,7 +66,7 @@ ContextProviderFactoryImpl::ContextProviderFactoryImpl(

: gpu_channel_factory_(gpu_channel_factory),

in_handle_pending_requests_(false),

in_shutdown_(false),

- next_client_id_(1u),

+ next_sink_id_(1u),

weak_factory_(this) {

DCHECK(gpu_channel_factory_);

}

@@ -136,7 +136,7 @@ cc::SurfaceManager* ContextProviderFactoryImpl::GetSurfaceManager() {

}

cc::FrameSinkId ContextProviderFactoryImpl::AllocateFrameSinkId() {

- return cc::FrameSinkId(++next_client_id_, 0 /* sink_id */);

+ return cc::FrameSinkId(0 /* client_id */, ++next_sink_id_);

Fady Samuel 2017/01/26 20:52:20 next_sink_id_++ to match other platforms. This sk

xlai (Olivia) 2017/01/26 20:59:44 Done.

}

gpu::GpuMemoryBufferManager*