Revert 247793 "Ensure GL initialization only happens once, and p..."

trunk/src/gpu/config/gpu_info_collector_android.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/config/gpu_info_collector.h"
 
 #include "base/android/build_info.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 47 matching lines @@
 
 ScopedRestoreNonOwnedEGLContext::ScopedRestoreNonOwnedEGLContext()
   : context_(EGL_NO_CONTEXT),
     display_(EGL_NO_DISPLAY),
     draw_surface_(EGL_NO_SURFACE),
     read_surface_(EGL_NO_SURFACE) {
   // This should only used to restore a context that is not created or owned by
   // Chromium native code, but created by Android system itself.
   DCHECK(!gfx::GLContext::GetCurrent());
 
-  context_ = eglGetCurrentContext();
-  display_ = eglGetCurrentDisplay();
-  draw_surface_ = eglGetCurrentSurface(EGL_DRAW);
-  read_surface_ = eglGetCurrentSurface(EGL_READ);
+  if (gfx::GLSurface::InitializeOneOff()) {
+    context_ = eglGetCurrentContext();
+    display_ = eglGetCurrentDisplay();
+    draw_surface_ = eglGetCurrentSurface(EGL_DRAW);
+    read_surface_ = eglGetCurrentSurface(EGL_READ);
+  }
 }
 
 ScopedRestoreNonOwnedEGLContext::~ScopedRestoreNonOwnedEGLContext() {
   if (context_ == EGL_NO_CONTEXT || display_ == EGL_NO_DISPLAY ||
-      draw_surface_ == EGL_NO_SURFACE || read_surface_ == EGL_NO_SURFACE)
+      draw_surface_ == EGL_NO_SURFACE || read_surface_ == EGL_NO_SURFACE) {
     return;
+  }
 
-  if (!eglMakeCurrent(display_, draw_surface_, read_surface_, context_))
+  if (!eglMakeCurrent(display_, draw_surface_, read_surface_, context_)) {
     LOG(WARNING) << "Failed to restore EGL context";
+  }
 }
 
 }
 
 namespace gpu {
 
 bool CollectContextGraphicsInfo(GPUInfo* gpu_info) {
   return CollectBasicGraphicsInfo(gpu_info);
 }
 
@@ skipping 23 matching lines @@
   gpu_info->gpu.device_string = gpu_info->gl_renderer;
   return true;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu