[Ozone] Initialize SurfaceFactoryOzone only in the EGL GLES2 case

ui/gl/gl_surface_ozone.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/gl_surface.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/ozone/surface_factory_ozone.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_surface_osmesa.h"
 #include "ui/gl/gl_surface_stub.h"
 
 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;
       }
     default:
       break;

[piman, 2014/03/28 19:57:38]

actually, should we return false here?

[dnicoara, 2014/03/28 20:30:37]

As is no since OSMesa uses this path and we need to return true for that. Maybe
we should add another case statement for OSMesa then we can return false for
everything else.

   }
   return true;
 }
 
 // static
 scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface(
     gfx::AcceleratedWidget window) {
   if (GetGLImplementation() == kGLImplementationOSMesaGL) {
     scoped_refptr<GLSurface> surface(new GLSurfaceOSMesaHeadless());
     if (!surface->Initialize())
@@ skipping 47 matching lines @@
       NOTREACHED();
       return NULL;
   }
 }
 
 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
   return SurfaceFactoryOzone::GetInstance()->GetNativeDisplay();
 }
 
 }  // namespace gfx