ui/views/mus/surface_context_factory.h - Issue 1808313002: Register surface namespace in BlimpUiContextFactory

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: ui/views/mus/surface_context_factory.h

Issue 1808313002: Register surface namespace in BlimpUiContextFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move SurfaceManager to ContextFactory Created 4 years, 9 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

« ui/compositor/test/in_process_context_factory.cc ('K') | « ui/compositor/test/in_process_context_factory.cc ('k') | ui/views/mus/surface_context_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/mus/surface_context_factory.h

diff --git a/ui/views/mus/surface_context_factory.h b/ui/views/mus/surface_context_factory.h

index 6399d5a011ba342eba580fdc28fb23fe9c5984fa..389a2e0085f85ee24d11b8cceecd09960939a325 100644

--- a/ui/views/mus/surface_context_factory.h

+++ b/ui/views/mus/surface_context_factory.h

@@ -47,6 +47,7 @@ class VIEWS_MUS_EXPORT SurfaceContextFactory : public ui::ContextFactory {

cc::SharedBitmapManager* GetSharedBitmapManager() override;

gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;

cc::TaskGraphRunner* GetTaskGraphRunner() override;

+ cc::SurfaceManager* GetSurfaceManager() override;

scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;

void ResizeDisplay(ui::Compositor* compositor,

const gfx::Size& size) override;

@@ -55,6 +56,7 @@ class VIEWS_MUS_EXPORT SurfaceContextFactory : public ui::ContextFactory {

uint32_t next_surface_id_namespace_;

gles2::RasterThreadHelper raster_thread_helper_;

mus::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;

+ scoped_ptr<cc::SurfaceManager> surface_manager_;

DISALLOW_COPY_AND_ASSIGN(SurfaceContextFactory);

};