Not for review.

ui/gl/gl_surface_egl.cc

Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index 3f8923ae895ecc38887237d6bd09f3c9425aa6e1..b12d9271b908f3699eca6454a5fc9178c679ece0 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -276,7 +276,7 @@ bool NativeViewGLSurfaceEGL::Initialize(VSyncProvider* sync_provider) {
   surface_ = eglCreateWindowSurface(
       GetDisplay(),
       GetConfig(),
-      window_,
+      reinterpret_cast<EGLNativeWindowType>(window_),
       gfx::g_driver_egl.ext.b_EGL_NV_post_sub_buffer ?
           egl_window_attributes_sub_buffer :
           NULL);
@@ -720,6 +720,9 @@ GLSurface::CreateViewGLSurface(gfx::AcceleratedWidget window) {
     scoped_refptr<NativeViewGLSurfaceEGL> surface;
     VSyncProvider* sync_provider = NULL;
 #if defined(USE_OZONE)
+    COMPILE_ASSERT(sizeof(EGLNativeWindowType) >=
+                   sizeof(gfx::AcceleratedWidget),
+                   EGLNativeWindowType_wide_enough);
     window = gfx::SurfaceFactoryOzone::GetInstance()->RealizeAcceleratedWidget(
         window);
     sync_provider =
@@ -749,8 +752,7 @@ GLSurface::CreateOffscreenGLSurface(const gfx::Size& size) {
     }
     case kGLImplementationEGLGLES2: {
       scoped_refptr<GLSurface> surface;
-      if (g_egl_surfaceless_context_supported &&
-         (size.width() == 0 && size.height() == 0)) {
+      if (g_egl_surfaceless_context_supported) {
         surface = new SurfacelessEGL(size);
       } else
         surface = new PbufferGLSurfaceEGL(size);