mojo/aura/surface_context_factory.h - Issue 669813003: Update from chromium https://crrev.com/301725/

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: mojo/aura/surface_context_factory.h

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 2 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:

Index: mojo/aura/surface_context_factory.h

diff --git a/mojo/aura/surface_context_factory.h b/mojo/aura/surface_context_factory.h

index d60080ef9b91fc98632618dcb46b2d21b04eea52..e9cdbed422c63baa05ce685704d75717f219d6f3 100644

--- a/mojo/aura/surface_context_factory.h

+++ b/mojo/aura/surface_context_factory.h

@@ -30,7 +30,7 @@ class SurfaceContextFactory : public ui::ContextFactory {

void RemoveCompositor(ui::Compositor* compositor) override;

bool DoesCreateTestContexts() override;

cc::SharedBitmapManager* GetSharedBitmapManager() override;

- cc::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;

+ gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;

base::MessageLoopProxy* GetCompositorMessageLoop() override;

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

« no previous file with comments | « gpu/tools/compositor_model_bench/render_tree.h ('k') | mojo/aura/surface_context_factory.cc » ('j') | no next file with comments »