Add gfx::SurfaceFactoryWebview

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.
 
 // This include must be here so that the includes provided transitively
 // by gl_surface_egl.h don't make it impossible to compile this code.
 #include "third_party/mesa/src/include/GL/osmesa.h"
 
 #include "ui/gl/gl_surface_egl.h"
 
 #if defined(OS_ANDROID)
 #include <android/native_window_jni.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "ui/gl/egl_util.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_osmesa.h"
 #include "ui/gl/gl_surface_stub.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/scoped_make_current.h"
 
+#if defined(OS_ANDROID)
+#include "ui/gl/android/surface_factory_android.h"
+#endif
+
 #if defined(USE_X11)
 extern "C" {
 #include <X11/Xlib.h>
 }
 #endif
 
 #if defined (USE_OZONE)
 #include "ui/base/ozone/surface_factory_ozone.h"
 #endif
 
@@ skipping 602 matching lines @@
 #if defined(USE_OZONE)
     window = ui::SurfaceFactoryOzone::GetInstance()->RealizeAcceleratedWidget(
         window);
     sync_provider =
         ui::SurfaceFactoryOzone::GetInstance()->GetVSyncProvider(window);
 #endif
     surface = new NativeViewGLSurfaceEGL(window);
     if(surface->Initialize(sync_provider))
       return surface;
   } else {
-    scoped_refptr<GLSurface> surface = new GLSurfaceStub();
+    scoped_refptr<GLSurface> surface;
+
+#if defined(OS_ANDROID)
+    if (SurfaceFactoryAndroid* factory = SurfaceFactoryAndroid::GetInstance())
+      surface = factory->CreateNonOwnedViewSurface();

[no sievers, 2013/08/06 20:31:29]

null check factory or tests will crash

[boliu, 2013/08/06 21:10:06]

That's what the if is for :)

+#endif
+
+    if (!surface)
+      surface = new GLSurfaceStub();
     if (surface->Initialize())
       return surface;
   }
   return NULL;
 }
 
 // static
 scoped_refptr<GLSurface>
 GLSurface::CreateOffscreenGLSurface(const gfx::Size& size) {
   switch (GetGLImplementation()) {
@@ skipping 13 matching lines @@
     }
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 #endif
 
 }  // namespace gfx