ui/gl/gl_surface_egl.cc - Issue 1171513002: Reland of 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_surface_egl.cc

Issue 1171513002: Reland of 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_surface_egl.cc

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

index 4d64da7880a2a7d31fddadc8fd1c457dabbe06bc..2e193a5d5dc2e2fcff8043065594bee13300930c 100644

--- a/ui/gl/gl_surface_egl.cc

+++ b/ui/gl/gl_surface_egl.cc

@@ -30,6 +30,7 @@ extern "C" {

#endif

#if defined (USE_OZONE)

+#include "ui/ozone/public/ozone_platform.h"

#include "ui/ozone/public/surface_factory_ozone.h"

#endif

@@ -305,9 +306,9 @@ bool GLSurfaceEGL::InitializeOneOff() {

};

#if defined(USE_OZONE)

- const EGLint* config_attribs =

- ui::SurfaceFactoryOzone::GetInstance()->GetEGLSurfaceProperties(

- kConfigAttribs);

+ const EGLint* config_attribs = ui::OzonePlatform::GetInstance()

+ ->GetSurfaceFactoryOzone()

+ ->GetEGLSurfaceProperties(kConfigAttribs);

#else

const EGLint* config_attribs = kConfigAttribs;

#endif

« no previous file with comments | « ui/gl/gl_implementation_ozone.cc ('k') | ui/gl/gl_surface_ozone.cc » ('j') | ui/ozone/demo/software_renderer.cc » ('J')