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

Unified Diff: ui/gl/gl_surface_ozone.cc

Issue 217003007: [Ozone] Initialize SurfaceFactoryOzone only in the EGL GLES2 case (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_ozone.cc
diff --git a/ui/gl/gl_surface_ozone.cc b/ui/gl/gl_surface_ozone.cc
index 616a01d57e5524f81c378a82ce0d117854c531fc..4ce8fde1bd410e2bf712c189187cf0add7563647 100644
--- a/ui/gl/gl_surface_ozone.cc
+++ b/ui/gl/gl_surface_ozone.cc
@@ -17,14 +17,14 @@ namespace gfx {
// static
bool GLSurface::InitializeOneOffInternal() {
- if (gfx::SurfaceFactoryOzone::GetInstance()->InitializeHardware() !=
- gfx::SurfaceFactoryOzone::INITIALIZED) {
- LOG(ERROR) << "Ozone failed to initialize hardware";
- return false;
- }
-
switch (GetGLImplementation()) {
case kGLImplementationEGLGLES2:
+ if (gfx::SurfaceFactoryOzone::GetInstance()->InitializeHardware() !=
+ gfx::SurfaceFactoryOzone::INITIALIZED) {
+ LOG(ERROR) << "Ozone failed to initialize hardware";
+ return false;
+ }
+
if (!GLSurfaceEGL::InitializeOneOff()) {
LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
return false;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698