Make NativeViewGLSurfaceEGL directly usable on Android.

ui/gl/gl_surface_egl.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 "ui/gl/gl_surface_egl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "build/build_config.h"
@@ skipping 154 matching lines @@
 NativeViewGLSurfaceEGL::NativeViewGLSurfaceEGL(bool software,
                                                gfx::AcceleratedWidget window)
     : window_(window),
       surface_(NULL),
       supports_post_sub_buffer_(false),
       config_(NULL) {
   software_ = software;
 }
 
 bool NativeViewGLSurfaceEGL::Initialize() {
-#if defined(OS_ANDROID)
-  NOTREACHED();
-  return false;
-#else
   DCHECK(!surface_);
 
   if (!GetDisplay()) {
     LOG(ERROR) << "Trying to create surface with invalid display.";
     return false;
   }
 
   static const EGLint egl_window_attributes_sub_buffer[] = {
+#if defined(EGL_NV_post_sub_buffer)

[no sievers, 2012/07/20 20:31:59]

Is this good?
This is not defined in the Android SDK header.

[piman, 2012/07/20 20:44:08]

bleh... we have 3 sets of includes: the ones in third_party/angle, the ones in
third_party/khronos, and the system ones...
Do you know the reason why we use the system ones on Android? Could we try to
use either the angle ones or the khronos ones instead (both seem to have
EGL_POST_SUB_BUFFER_SUPPORTED_NV) - possibly fixing them as needed?

[no sievers, 2012/07/20 21:11:06]

Word. Especially, since this file is explicit about using the angle header.

On 2012/07/20 20:44:08, piman wrote:

     EGL_POST_SUB_BUFFER_SUPPORTED_NV, EGL_TRUE,
+#endif
     EGL_NONE
   };
 
   // Create a surface for the native window.
   surface_ = eglCreateWindowSurface(GetDisplay(),
                                     GetConfig(),
                                     window_,
                                     gfx::g_EGL_NV_post_sub_buffer ?
                                         egl_window_attributes_sub_buffer :
                                         NULL);
 
   if (!surface_) {
     LOG(ERROR) << "eglCreateWindowSurface failed with error "
                << GetLastEGLErrorString();
     Destroy();
     return false;
   }
 
+#if defined(EGL_NV_post_sub_buffer)
   EGLint surfaceVal;
   EGLBoolean retVal = eglQuerySurface(GetDisplay(),
                                       surface_,
                                       EGL_POST_SUB_BUFFER_SUPPORTED_NV,
                                       &surfaceVal);
   supports_post_sub_buffer_ = (surfaceVal && retVal) == EGL_TRUE;
+#endif
 
   return true;
-#endif
 }
 
 void NativeViewGLSurfaceEGL::Destroy() {
   if (surface_) {
     if (!eglDestroySurface(GetDisplay(), surface_)) {
       LOG(ERROR) << "eglDestroySurface failed with error "
                  << GetLastEGLErrorString();
     }
     surface_ = NULL;
   }
@@ skipping 252 matching lines @@
 
   return handle;
 #endif
 }
 
 PbufferGLSurfaceEGL::~PbufferGLSurfaceEGL() {
   Destroy();
 }
 
 }  // namespace gfx