content/browser/renderer_host/context_provider_factory_impl_android.h - Issue 2382873002: Replace usage of SurfaceId's client_id with FrameSinkId

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.h

Issue 2382873002: Replace usage of SurfaceId's client_id with FrameSinkId (Closed)

Patch Set: Fixed windows + android + mac issues Created 4 years, 3 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/renderer_host/compositor_impl_android.cc ('K') | « content/browser/renderer_host/compositor_impl_android.cc ('k') | content/browser/renderer_host/context_provider_factory_impl_android.cc » ('j') | content/browser/renderer_host/context_provider_factory_impl_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/context_provider_factory_impl_android.h

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

index 7abc578a8304d51e66295698bb903caee567b035..a08c71339d7a7b2643bdc0177e1918d49615e3c6 100644

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

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

@@ -63,7 +63,7 @@ class CONTENT_EXPORT ContextProviderFactoryImpl

cc::ContextProvider* shared_context_provider,

scoped_refptr<gpu::GpuChannelHost> gpu_channel_host) override;

cc::SurfaceManager* GetSurfaceManager() override;

- uint32_t AllocateSurfaceClientId() override;

+ cc::FrameSinkId AllocateFrameSinkId() override;

cc::SharedBitmapManager* GetSharedBitmapManager() override;

gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;

@@ -105,7 +105,7 @@ class CONTENT_EXPORT ContextProviderFactoryImpl

base::OneShotTimer establish_gpu_channel_timeout_;

std::unique_ptr<cc::SurfaceManager> surface_manager_;

- int surface_client_id_;

+ uint32_t next_client_id_;

base::WeakPtrFactory<ContextProviderFactoryImpl> weak_factory_;