Revert r258965 aka reland r258122

ui/gl/gl_gl_api_implementation.h

 // 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.
 
 #ifndef UI_GL_GL_GL_API_IMPLEMENTATION_H_
 #define UI_GL_GL_GL_API_IMPLEMENTATION_H_
 
 #include "base/compiler_specific.h"
 #include "ui/gl/gl_bindings.h"
 
@@ skipping 23 matching lines @@
  public:
   // Include the auto-generated part of this class. We split this because
   // it means we can easily edit the non-auto generated parts right here in
   // this file instead of having to edit some template or the code generator.
   #include "gl_bindings_api_autogen_gl.h"
 
  protected:
   GLApiBase();
   virtual ~GLApiBase();
   void InitializeBase(DriverGL* driver);
+  void SignalFlush();
 
   DriverGL* driver_;
 };
 
 // Implemenents the GL API by calling directly into the driver.
 class RealGLApi : public GLApiBase {
  public:
   RealGLApi();
   virtual ~RealGLApi();
   void Initialize(DriverGL* driver);
+
+ private:
+  virtual void glFinishFn() OVERRIDE;
+  virtual void glFlushFn() OVERRIDE;
 };
 
 // Inserts a TRACE for every GL call.
 class TraceGLApi : public GLApi {
  public:
   TraceGLApi(GLApi* gl_api) : gl_api_(gl_api) { }
   virtual ~TraceGLApi();
 
   // Include the auto-generated part of this class. We split this because
   // it means we can easily edit the non-auto generated parts right here in
@@ skipping 23 matching lines @@
  public:
   VirtualGLApi();
   virtual ~VirtualGLApi();
   void Initialize(DriverGL* driver, GLContext* real_context);
 
   // Sets the current virutal context.
   bool MakeCurrent(GLContext* virtual_context, GLSurface* surface);
 
   void OnReleaseVirtuallyCurrent(GLContext* virtual_context);
 
+private:
   // Overridden functions from GLApiBase
   virtual const GLubyte* glGetStringFn(GLenum name) OVERRIDE;
+  virtual void glFinishFn() OVERRIDE;
+  virtual void glFlushFn() OVERRIDE;
 
- private:
   // The real context we're running on.
   GLContext* real_context_;
 
   // The current virtual context.
   GLContext* current_context_;
 
   // The supported extensions being advertised for this virtual context.
   std::string extensions_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_GL_API_IMPLEMENTATION_H_