ui/gl/gl_implementation_ozone.cc - Issue 1167533007: Revert of ozone: Remove singleton pattern for SurfaceFactoryOzone.

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/gl/gl_implementation_ozone.cc

Issue 1167533007: Revert of ozone: Remove singleton pattern for SurfaceFactoryOzone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: ui/gl/gl_implementation_ozone.cc

diff --git a/ui/gl/gl_implementation_ozone.cc b/ui/gl/gl_implementation_ozone.cc

index 715084f50dbf552aea987354bb6b63e3aadc018d..2a85720da5f182d970162f271601c27fe7e8f43c 100644

--- a/ui/gl/gl_implementation_ozone.cc

+++ b/ui/gl/gl_implementation_ozone.cc

@@ -44,10 +44,9 @@

case kGLImplementationOSMesaGL:

return InitializeStaticGLBindingsOSMesaGL();

case kGLImplementationEGLGLES2:

- if (!ui::OzonePlatform::GetInstance()

- ->GetSurfaceFactoryOzone()

- ->LoadEGLGLES2Bindings(base::Bind(&AddGLNativeLibrary),

- base::Bind(&SetGLGetProcAddressProc)))

+ if (!ui::SurfaceFactoryOzone::GetInstance()->LoadEGLGLES2Bindings(

+ base::Bind(&AddGLNativeLibrary),

+ base::Bind(&SetGLGetProcAddressProc)))

return false;

SetGLImplementation(kGLImplementationEGLGLES2);

InitializeStaticGLBindingsGL();

« no previous file with comments | « content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc ('k') | ui/gl/gl_surface_egl.cc » ('j') | no next file with comments »