Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

Unified Diff: ui/gl/init/gl_initializer_ozone.cc

Issue 2136553002: Remove GetPlatformDefaultEGLNativeDisplay() function. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back to original. Created 4 years, 5 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
« no previous file with comments | « ui/gl/init/gl_initializer_android.cc ('k') | ui/gl/init/gl_initializer_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/init/gl_initializer_ozone.cc
diff --git a/ui/gl/init/gl_initializer_ozone.cc b/ui/gl/init/gl_initializer_ozone.cc
index d53f3444bd9a953341ba2609f672412149a52ad2..22a894343ebbaf2a036f6eaa21ea839ff592f5db 100644
--- a/ui/gl/init/gl_initializer_ozone.cc
+++ b/ui/gl/init/gl_initializer_ozone.cc
@@ -20,10 +20,12 @@ namespace init {
namespace {
+ui::SurfaceFactoryOzone* GetSurfaceFactory() {
+ return ui::OzonePlatform::GetInstance()->GetSurfaceFactoryOzone();
+}
+
bool InitializeStaticEGLInternal() {
- auto surface_factory =
- ui::OzonePlatform::GetInstance()->GetSurfaceFactoryOzone();
- if (!surface_factory->LoadEGLGLES2Bindings(
+ if (!GetSurfaceFactory()->LoadEGLGLES2Bindings(
base::Bind(&AddGLNativeLibrary),
base::Bind(&SetGLGetProcAddressProc))) {
return false;
@@ -41,7 +43,8 @@ bool InitializeStaticEGLInternal() {
bool InitializeGLOneOffPlatform() {
switch (GetGLImplementation()) {
case kGLImplementationEGLGLES2:
- if (!GLSurfaceEGL::InitializeOneOff()) {
+ if (!GLSurfaceEGL::InitializeOneOff(
+ GetSurfaceFactory()->GetNativeDisplay())) {
LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
return false;
}
« no previous file with comments | « ui/gl/init/gl_initializer_android.cc ('k') | ui/gl/init/gl_initializer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698