Hook up android webview synchronous compositor GL init

content/browser/android/in_process/synchronous_compositor_output_surface.cc

 // 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.
 
 #include "content/browser/android/in_process/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/browser/android/in_process/synchronous_compositor_impl.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.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 "ui/gl/gl_context.h"
 #include "webkit/common/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 34 matching lines @@
   SynchronousCompositorOutputSurface* surface_;
   SkDevice null_device_;
   SkCanvas null_canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareDevice);
 };
 
 SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
     int routing_id)
     : cc::OutputSurface(
-          CreateWebGraphicsContext3D(),
           scoped_ptr<cc::SoftwareOutputDevice>(new SoftwareDevice(this))),
       routing_id_(routing_id),
       needs_begin_frame_(false),
       did_swap_buffer_(false),
       current_sw_canvas_(NULL) {
   capabilities_.deferred_gl_initialization = true;
   // Cannot call out to GetDelegate() here as the output surface is not
   // constructed on the correct thread.
 }
 
@@ skipping 38 matching lines @@
   if (delegate)
     delegate->SetContinuousInvalidate(needs_begin_frame_);
 }
 
 void SynchronousCompositorOutputSurface::SwapBuffers(
     const ui::LatencyInfo& info) {
   context3d()->shallowFlushCHROMIUM();
   did_swap_buffer_ = true;
 }
 
-bool SynchronousCompositorOutputSurface::IsHwReady() {
-  return context3d() != NULL;
-}
-
 namespace {
 void AdjustTransformForClip(gfx::Transform* transform, gfx::Rect clip) {
   // The system-provided transform translates us from the screen origin to the
   // origin of the clip rect, but CC's draw origin starts at the clip.
   transform->matrix().postTranslate(-clip.x(), -clip.y(), 0);
 }
 } // namespace
 
 bool SynchronousCompositorOutputSurface::DemandDrawSw(SkCanvas* canvas) {
   DCHECK(CalledOnValidThread());
@@ skipping 13 matching lines @@
                             canvas->getDeviceSize().height());
   client_->SetExternalDrawConstraints(transform, clip);
 
   InvokeComposite(clip.size());
 
   bool finished_draw = current_sw_canvas_ == NULL;
   current_sw_canvas_ = NULL;
   return finished_draw;
 }
 
+bool SynchronousCompositorOutputSurface::InitializeHwDraw() {
+  DCHECK(CalledOnValidThread());
+  DCHECK(client_);
+  DCHECK(!context3d_);
+
+  // TODO(boliu): Get a context provider in constructor and pass here.
+  bool success =
+      InitializeAndSetContext3D(CreateWebGraphicsContext3D().Pass(),
+                                scoped_refptr<cc::ContextProvider>());
+  if (!success)
+    client_->DidLoseOutputSurface();

[joth, 2013/06/07 01:08:03]

could base class InitializeAndSetContext3D() handle this too? It does, after
all, handle client_->DeferredInitialize() in the success case.

[boliu, 2013/06/07 18:46:18]

With the new contract in OutputSurface, we can just fall back directly to
software draw mode without recreating this, so removing this call.

+
+  return success;
+}
+
 bool SynchronousCompositorOutputSurface::DemandDrawHw(
-      gfx::Size surface_size,
-      const gfx::Transform& transform,
-      gfx::Rect clip) {
+    gfx::Size surface_size,
+    const gfx::Transform& transform,
+    gfx::Rect clip) {
   DCHECK(CalledOnValidThread());
   DCHECK(client_);
   DCHECK(context3d());
 
   // Force a GL state restore next time a GLContextVirtual is made current.
   // TODO(boliu): Move this to the end of this function after we have fixed
   // all cases of MakeCurrent calls outside of draws. Tracked in
   // crbug.com/239856.
   gfx::GLContext* current_context = gfx::GLContext::GetCurrent();
   if (current_context)
     current_context->ReleaseCurrent(NULL);
 
   did_swap_buffer_ = false;
 
   gfx::Transform adjusted_transform = transform;
   AdjustTransformForClip(&adjusted_transform, clip);
   surface_size_ = surface_size;
   client_->SetExternalDrawConstraints(adjusted_transform, clip);
   InvokeComposite(clip.size());
 
+  // TODO(boliu): Check if context is lost here.
+
   return did_swap_buffer_;
 }
 
 void SynchronousCompositorOutputSurface::InvokeComposite(
     gfx::Size damage_size) {
   client_->SetNeedsRedrawRect(gfx::Rect(damage_size));
   if (needs_begin_frame_)
     client_->BeginFrame(base::TimeTicks::Now());
 }
 
 // Not using base::NonThreadSafe as we want to enforce a more exacting threading
 // requirement: SynchronousCompositorOutputSurface() must only be used on the UI
 // thread.
 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const {
   return BrowserThread::CurrentlyOn(BrowserThread::UI);
 }
 
 SynchronousCompositorOutputSurfaceDelegate*
 SynchronousCompositorOutputSurface::GetDelegate() {
   return SynchronousCompositorImpl::FromRoutingID(routing_id_);
 }
 
 }  // namespace content