Use C OpenGL interface in mojo::GLContext

mojo/gpu/gl_context.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 "mojo/gpu/gl_context.h"
 
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
+#include "mojo/gpu/mojo_gles2_impl_autogen.h"
 
 namespace mojo {
 
 GLContext::Observer::~Observer() {
 }
 
 GLContext::GLContext(Shell* shell) : weak_factory_(this) {
   ServiceProviderPtr native_viewport;
   shell->ConnectToApplication("mojo:native_viewport_service",
                               GetProxy(&native_viewport), nullptr);
   GpuPtr gpu_service;
   ConnectToService(native_viewport.get(), &gpu_service);
   CommandBufferPtr command_buffer;
   gpu_service->CreateOffscreenGLES2Context(GetProxy(&command_buffer));
   context_ = MojoGLES2CreateContext(
       command_buffer.PassInterface().PassHandle().release().value(),
       &ContextLostThunk, this, Environment::GetDefaultAsyncWaiter());
-  gl_ = static_cast<gpu::gles2::GLES2Interface*>(
-      MojoGLES2GetGLES2Interface(context_));
+  gl_impl_.reset(new MojoGLES2Impl(context_));
 }
 
 GLContext::~GLContext() {
   MojoGLES2DestroyContext(context_);
 }
 
 base::WeakPtr<GLContext> GLContext::Create(Shell* shell) {
   return (new GLContext(shell))->weak_factory_.GetWeakPtr();
 }
 
 void GLContext::MakeCurrent() {
   MojoGLES2MakeCurrent(context_);
 }
 
 void GLContext::Destroy() {
   delete this;
 }
 
+gpu::gles2::GLES2Interface* GLContext::gl() const {
+  return gl_impl_.get();

[viettrungluu, 2015/08/24 17:51:06]

It should be OK to inline this.

+}
+
 void GLContext::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void GLContext::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void GLContext::ContextLostThunk(void* self) {
   static_cast<GLContext*>(self)->OnContextLost();
 }
 
 void GLContext::OnContextLost() {
   FOR_EACH_OBSERVER(Observer, observers_, OnContextLost());
 }
 
 }  // namespace mojo