Revert r258965 aka reland r258122

ui/gl/gl_gl_api_implementation.cc

Index: ui/gl/gl_gl_api_implementation.cc
diff --git a/ui/gl/gl_gl_api_implementation.cc b/ui/gl/gl_gl_api_implementation.cc
index ad5117053c560823e935de13581203abf81471c1..9600ad3286d9a52483350e622ccd885a73442a0a 100644
--- a/ui/gl/gl_gl_api_implementation.cc
+++ b/ui/gl/gl_gl_api_implementation.cc
@@ -355,6 +355,11 @@ void GLApiBase::InitializeBase(DriverGL* driver) {
   driver_ = driver;
 }
 
+void GLApiBase::SignalFlush() {
+  DCHECK(GLContext::GetCurrent());
+  GLContext::GetCurrent()->OnFlush();
+}
+
 RealGLApi::RealGLApi() {
 }
 
@@ -365,6 +370,16 @@ void RealGLApi::Initialize(DriverGL* driver) {
   InitializeBase(driver);
 }
 
+void RealGLApi::glFlushFn() {
+  GLApiBase::glFlushFn();
+  GLApiBase::SignalFlush();
+}
+
+void RealGLApi::glFinishFn() {
+  GLApiBase::glFinishFn();
+  GLApiBase::SignalFlush();
+}
+
 TraceGLApi::~TraceGLApi() {
 }
 
@@ -463,4 +478,14 @@ const GLubyte* VirtualGLApi::glGetStringFn(GLenum name) {
   }
 }
 
+void VirtualGLApi::glFlushFn() {
+  GLApiBase::glFlushFn();
+  GLApiBase::SignalFlush();
+}
+
+void VirtualGLApi::glFinishFn() {
+  GLApiBase::glFinishFn();
+  GLApiBase::SignalFlush();
+}
+
 }  // namespace gfx