Add gfx::SurfaceFactoryWebview

android_webview/browser/in_process_view_renderer.h

 // Copyright 2013 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_IN_PROCESS_VIEW_RENDERER_H_
 #define ANDROID_WEBVIEW_BROWSER_IN_PROCESS_VIEW_RENDERER_H_
 
 #include <string>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/gl_view_renderer_manager.h"
 #include "base/cancelable_callback.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
 #include "ui/gfx/vector2d_f.h"
+#include "ui/gl/android/gl_factory_android.h"
 
 namespace content {
 class SynchronousCompositor;
 class WebContents;
 }
 
+namespace gfx {
+class GLSurface;
+}
+
 typedef void* EGLContext;
 class SkCanvas;
 
 namespace android_webview {
 
+class AwGLSurface;
+
 // Provides RenderViewHost wrapper functionality for sending WebView-specific
 // IPC messages to the renderer and from there to WebKit.
 class InProcessViewRenderer : public BrowserViewRenderer,
-                              public content::SynchronousCompositorClient {
+                              public content::SynchronousCompositorClient,
+                              public gfx::GLFactoryAndroid {
  public:
   InProcessViewRenderer(BrowserViewRenderer::Client* client,
                         JavaHelper* java_helper,
                         content::WebContents* web_contents);
   virtual ~InProcessViewRenderer();
 
   static InProcessViewRenderer* FromWebContents(
       content::WebContents* contents);
 
-  // BrowserViewRenderer overrides
+  // BrowserViewRenderer overrides.
   virtual bool OnDraw(jobject java_canvas,
                       bool is_hardware_canvas,
                       const gfx::Vector2d& scroll_,
                       const gfx::Rect& clip) OVERRIDE;
   virtual void DrawGL(AwDrawGLInfo* draw_info) OVERRIDE;
   virtual void SetGlobalVisibleRect(const gfx::Rect& visible_rect) OVERRIDE;
   virtual base::android::ScopedJavaLocalRef<jobject> CapturePicture(
       int width,
       int height) OVERRIDE;
   virtual void EnableOnNewPicture(bool enabled) OVERRIDE;
   virtual void OnVisibilityChanged(bool visible) OVERRIDE;
   virtual void OnSizeChanged(int width, int height) OVERRIDE;
   virtual void ScrollTo(gfx::Vector2d new_value) OVERRIDE;
   virtual void SetPageScaleFactor(float page_scale_factor) OVERRIDE;
   virtual void OnAttachedToWindow(int width, int height) OVERRIDE;
   virtual void OnDetachedFromWindow() OVERRIDE;
   virtual void SetDipScale(float dip_scale) OVERRIDE;
   virtual bool IsAttachedToWindow() OVERRIDE;
   virtual bool IsViewVisible() OVERRIDE;
   virtual gfx::Rect GetScreenRect() OVERRIDE;
 
-  // SynchronousCompositorClient overrides
+  // SynchronousCompositorClient overrides.
   virtual void DidInitializeCompositor(
       content::SynchronousCompositor* compositor) OVERRIDE;
   virtual void DidDestroyCompositor(
       content::SynchronousCompositor* compositor) OVERRIDE;
   virtual void SetContinuousInvalidate(bool invalidate) OVERRIDE;
   virtual void SetTotalRootLayerScrollOffset(
       gfx::Vector2dF new_value_css) OVERRIDE;
   virtual void DidUpdateContent() OVERRIDE;
   virtual gfx::Vector2dF GetTotalRootLayerScrollOffset() OVERRIDE;
   virtual void DidOverscroll(gfx::Vector2dF latest_overscroll_delta,
                              gfx::Vector2dF current_fling_velocity) OVERRIDE;
 
+  // gfx::GLFactoryAndroid overrides.
+  virtual scoped_refptr<gfx::GLSurface> CreateNonOwnedViewSurface() OVERRIDE;
+
   void WebContentsGone();
   bool RequestProcessGL();
 
  private:
   // Checks the continuous invalidate and block invalidate state, and schedule
   // invalidates appropriately. If |invalidate_ignore_compositor| is true,
   // then send a view invalidate regardless of compositor expectation.
   void EnsureContinuousInvalidation(
       AwDrawGLInfo* draw_info,
       bool invalidate_ignore_compositor);
   bool DrawSWInternal(jobject java_canvas,
                       const gfx::Rect& clip_bounds);
   bool CompositeSW(SkCanvas* canvas);
 
   void UpdateCachedGlobalVisibleRect();
 
   // If we call up view invalidate and OnDraw is not called before a deadline,
   // then we keep ticking the SynchronousCompositor so it can make progress.
   void FallbackTickFired();
 
   void NoLongerExpectsDrawGL();
 
+  bool InitializeHwDraw();
+
   // For debug tracing or logging. Return the string representation of this
   // view renderer's state and the |draw_info| if provided.
   std::string ToString(AwDrawGLInfo* draw_info) const;
 
   BrowserViewRenderer::Client* client_;
   BrowserViewRenderer::JavaHelper* java_helper_;
   content::WebContents* web_contents_;
   content::SynchronousCompositor* compositor_;
 
   bool visible_;
@@ skipping 14 matching lines @@
 
   // Holds a callback to FallbackTickFired while it is pending.
   base::CancelableClosure fallback_tick_;
 
   int width_;
   int height_;
 
   bool attached_to_window_;
   bool hardware_initialized_;
   bool hardware_failed_;
+  scoped_refptr<AwGLSurface> gl_surface_;
 
   // Used only for detecting Android View System context changes.
   // Not to be used between draw calls.
   EGLContext last_egl_context_;
 
   // Should always call UpdateCachedGlobalVisibleRect before using this.
   gfx::Rect cached_global_visible_rect_;
 
   // Last View scroll when View.onDraw() was called.
   gfx::Vector2d scroll_at_start_of_frame_;
 
   // Current scroll offset in CSS pixels.
   gfx::Vector2dF scroll_offset_css_;
 
   // Used to prevent rounding errors from accumulating enough to generate
   // visible skew (especially noticeable when scrolling up and down in the same
   // spot over a period of time).
   gfx::Vector2dF overscroll_rounding_error_;
 
   GLViewRendererManager::Key manager_key_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessViewRenderer);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_IN_PROCESS_VIEW_RENDERER_H_