Revert "gpu: Fix Vivante's "hisilicon" GPUs"

ui/gl/gl_context_egl.cc

Index: ui/gl/gl_context_egl.cc
diff --git a/ui/gl/gl_context_egl.cc b/ui/gl/gl_context_egl.cc
index c29eb2aed05d81598493e78f57bfd4bb0ae78eba..52c60e25e8902889995328672bd866fee7a2cdee 100644
--- a/ui/gl/gl_context_egl.cc
+++ b/ui/gl/gl_context_egl.cc
@@ -112,9 +112,6 @@ bool GLContextEGL::MakeCurrent(GLSurface* surface) {
     return false;
   }
 
-  if (!RecreateSurfaceIfNeeded(surface))
-    return false;
-
   if (!surface->OnMakeCurrent(this)) {
     LOG(ERROR) << "Could not make current.";
     return false;
@@ -124,39 +121,6 @@ bool GLContextEGL::MakeCurrent(GLSurface* surface) {
   return true;
 }
 
-bool GLContextEGL::RecreateSurfaceIfNeeded(GLSurface* surface) {
-  if (!surface || !surface->RecreateOnMakeCurrent())
-    return true;
-
-  // This is specifically needed for Vivante GPU's on Android.
-  // A native view surface will not be configured correctly
-  // unless we do all of the following steps after making the
-  // surface current.
-  GLint fbo = 0;
-  glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fbo);
-  glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
-
-  eglMakeCurrent(display_,
-                 EGL_NO_SURFACE,
-                 EGL_NO_SURFACE,
-                 EGL_NO_CONTEXT);
-  if (!surface->Recreate()) {
-    LOG(ERROR) << "Failed to recreate surface";
-    return false;
-  }
-  if (!eglMakeCurrent(display_,
-                      surface->GetHandle(),
-                      surface->GetHandle(),
-                      context_)) {
-    LOG(ERROR) << "eglMakeCurrent failed with error "
-               << GetLastEGLErrorString();
-    return false;
-  }
-
-  glBindFramebufferEXT(GL_FRAMEBUFFER, fbo);
-  return true;
-}
-
 void GLContextEGL::ReleaseCurrent(GLSurface* surface) {
   if (!IsCurrent(surface))
     return;