cc::OutputSurfaceClient::InitializeForGL

content/renderer/android/synchronous_compositor_output_surface.cc

 // Copyright (c) 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.
 
 #include "content/renderer/android/synchronous_compositor_output_surface.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
+#include "cc/output/context_provider.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/software_output_device.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/android/synchronous_compositor_client.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
 
 namespace content {
 
 namespace {
 
 // TODO(boliu): RenderThreadImpl should create in process contexts as well.
 scoped_ptr<WebKit::WebGraphicsContext3D> CreateWebGraphicsContext3D() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch("testing-webview-gl-mode"))
-    return scoped_ptr<WebKit::WebGraphicsContext3D>();
-
   WebKit::WebGraphicsContext3D::Attributes attributes;
   attributes.antialias = false;
   attributes.shareResources = true;
   attributes.noAutomaticFlushes = true;
 
   return scoped_ptr<WebKit::WebGraphicsContext3D>(
       WebGraphicsContext3DInProcessCommandBufferImpl
           ::CreateViewContext(attributes, NULL));
 }
 
@@ skipping 33 matching lines @@
  private:
   SynchronousCompositorOutputSurface* surface_;
   SkDevice null_device_;
   SkCanvas null_canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareDevice);
 };
 
 SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
     int32 routing_id)
-    : cc::OutputSurface(CreateWebGraphicsContext3D(),
-                        scoped_ptr<cc::SoftwareOutputDevice>(
-                            new SoftwareDevice(this))),
+    : cc::OutputSurface(
+          scoped_ptr<cc::SoftwareOutputDevice>(new SoftwareDevice(this))),
       compositor_client_(NULL),
       routing_id_(routing_id),
       needs_begin_frame_(false),
       did_swap_buffer_(false),
       current_sw_canvas_(NULL) {
   capabilities_.deferred_gl_initialization = true;
 }
 
 SynchronousCompositorOutputSurface::~SynchronousCompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
@@ skipping 38 matching lines @@
   did_swap_buffer_ = true;
 }
 
 void SynchronousCompositorOutputSurface::SetClient(
     SynchronousCompositorClient* compositor_client) {
   DCHECK(CalledOnValidThread());
   compositor_client_ = compositor_client;
   UpdateCompositorClientSettings();
 }
 
-bool SynchronousCompositorOutputSurface::IsHwReady() {
-  return context3d() != NULL;
-}
-
 bool SynchronousCompositorOutputSurface::DemandDrawSw(SkCanvas* canvas) {
   DCHECK(CalledOnValidThread());
   DCHECK(canvas);
   DCHECK(!current_sw_canvas_);
   current_sw_canvas_ = canvas;
 
   SkRect canvas_clip;
   gfx::Rect damage_area;
   if (canvas->getClipBounds(&canvas_clip)) {
     damage_area = gfx::ToEnclosedRect(gfx::SkRectToRectF(canvas_clip));
   } else {
     damage_area = gfx::Rect(kint16max, kint16max);
   }
 
   gfx::Transform transform;
   transform.matrix() = canvas->getTotalMatrix();  // Converts 3x3 matrix to 4x4.
 
   InvokeComposite(transform, damage_area);
 
   bool finished_draw = current_sw_canvas_ == NULL;
   current_sw_canvas_ = NULL;
   return finished_draw;
 }
 
+bool SynchronousCompositorOutputSurface::InitializeHwDraw() {
+  DCHECK(CalledOnValidThread());
+  DCHECK(client_);
+  DCHECK(!context3d_);
+
+  context3d_ = CreateWebGraphicsContext3D().Pass();
+
+  // TODO(boliu): Get a context provider in constructor and pass here.
+  bool result = client_->InitializeForGL(scoped_refptr<cc::ContextProvider>());
+  if (!result)
+    client_->DidLoseOutputSurface();
+  return result;
+}
+
 bool SynchronousCompositorOutputSurface::DemandDrawHw(
-      gfx::Size view_size,
-      const gfx::Transform& transform,
-      gfx::Rect damage_area) {
+    gfx::Size view_size,
+    const gfx::Transform& transform,
+    gfx::Rect damage_area) {
   DCHECK(CalledOnValidThread());
   DCHECK(client_);
 
   did_swap_buffer_ = false;
 
   InvokeComposite(transform, damage_area);
 
   return did_swap_buffer_;
 }
 
@@ skipping 16 matching lines @@
 // Not using base::NonThreadSafe as we want to enforce a more exacting threading
 // requirement: SynchronousCompositorOutputSurface() must only be used by
 // embedders that supply their own compositor loop via
 // OverrideCompositorMessageLoop().
 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const {
   return base::MessageLoop::current() && (base::MessageLoop::current() ==
       GetContentClient()->renderer()->OverrideCompositorMessageLoop());
 }
 
 }  // namespace content