Split //ui/gl into //ui/gl + //ui/gi/init.

gpu/gles2_conform_support/egl/display.cc

 // Copyright (c) 2012 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 "gpu/gles2_conform_support/egl/display.h"
 
 #include "gpu/gles2_conform_support/egl/config.h"
 #include "gpu/gles2_conform_support/egl/context.h"
 #include "gpu/gles2_conform_support/egl/surface.h"
 #include "gpu/gles2_conform_support/egl/thread_state.h"
+#include "ui/gl/init/gl_factory.h"
 
 namespace egl {
 
 Display::Display()
     : is_initialized_(false),
       next_create_window_surface_creates_pbuffer_(false),
       window_surface_pbuffer_width_(0),
       window_surface_pbuffer_height_(0) {
 }
 
@@ skipping 150 matching lines @@
   }
   return DoCreatePbufferSurface(ts, config, width, height);
 }
 
 EGLSurface Display::DoCreatePbufferSurface(ThreadState* ts,
                                            const Config* config,
                                            EGLint width,
                                            EGLint height) {
   lock_.AssertAcquired();
   scoped_refptr<gfx::GLSurface> gl_surface;
-  gl_surface =
-      gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(width, height));
+  gl_surface = gl::init::CreateOffscreenGLSurface(gfx::Size(width, height));
   if (!gl_surface)
     return ts->ReturnError(EGL_BAD_ALLOC, nullptr);
   surfaces_.emplace_back(new Surface(gl_surface.get(), config));
   return ts->ReturnSuccess<EGLSurface>(surfaces_.back().get());
 }
 
 EGLSurface Display::CreateWindowSurface(ThreadState* ts,
                                         EGLConfig cfg,
                                         EGLNativeWindowType win,
                                         const EGLint* attrib_list) {
@@ skipping 14 matching lines @@
   if (next_create_window_surface_creates_pbuffer_) {
     EGLSurface result = DoCreatePbufferSurface(ts, config,
                                                window_surface_pbuffer_width_,
                                                window_surface_pbuffer_height_);
     next_create_window_surface_creates_pbuffer_ = false;
     window_surface_pbuffer_width_ = 0;
     window_surface_pbuffer_height_ = 0;
     return result;
   }
   scoped_refptr<gfx::GLSurface> gl_surface;
-  gl_surface = gfx::GLSurface::CreateViewGLSurface(win);
+  gl_surface = gl::init::CreateViewGLSurface(win);
   if (!gl_surface)
     return ts->ReturnError(EGL_BAD_ALLOC, EGL_NO_SURFACE);
   surfaces_.emplace_back(new Surface(gl_surface.get(), config));
   return ts->ReturnSuccess(surfaces_.back().get());
 }
 
 EGLBoolean Display::DestroySurface(ThreadState* ts, EGLSurface sfe) {
   base::AutoLock auto_lock(lock_);
   if (!is_initialized_)
     return ts->ReturnError(EGL_NOT_INITIALIZED, EGL_FALSE);
@@ skipping 165 matching lines @@
 
 Context* Display::GetContext(EGLContext context) {
   lock_.AssertAcquired();
   auto it = std::find(contexts_.begin(), contexts_.end(), context);
   if (it == contexts_.end())
     return nullptr;
   return it->get();
 }
 
 }  // namespace egl