Factor out cc::OutputSurface::InitializeAndSetContext3D

cc/output/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 "cc/output/output_surface.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 12 matching lines @@
 using std::vector;
 
 namespace cc {
 
 class OutputSurfaceCallbacks
     : public WebKit::WebGraphicsContext3D::
         WebGraphicsSwapBuffersCompleteCallbackCHROMIUM,
       public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
  public:
   explicit OutputSurfaceCallbacks(OutputSurfaceClient* client)
-      : client_(client) {}
+      : client_(client) {
+    DCHECK(client_);
+  }
 
   // WK:WGC3D::WGSwapBuffersCompleteCallbackCHROMIUM implementation.
   virtual void onSwapBuffersComplete() { client_->OnSwapBuffersComplete(); }
 
   // WK:WGC3D::WGContextLostCallback implementation.
   virtual void onContextLost() { client_->DidLoseOutputSurface(); }
 
  private:
   OutputSurfaceClient* client_;
 };
@@ skipping 27 matching lines @@
 OutputSurface::~OutputSurface() {
 }
 
 bool OutputSurface::ForcedDrawToSoftwareDevice() const {
   return false;
 }
 
 bool OutputSurface::BindToClient(
     cc::OutputSurfaceClient* client) {
   DCHECK(client);
-  if (context3d_ && !context3d_->makeContextCurrent())
-    return false;
   client_ = client;
-  if (!context3d_)
-    return true;
-  string extensions_string = UTF16ToASCII(context3d_->getString(GL_EXTENSIONS));
+  bool success = true;
+
+  if (context3d_) {
+    success = context3d_->makeContextCurrent();
+    if (success)
+      SetContext3D(context3d_.Pass());
+  }
+
+  if (!success)
+    client_ = NULL;
+
+  return success;
+}
+
+bool OutputSurface::InitializeAndSetContext3D(
+    scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
+    scoped_refptr<ContextProvider> context_provider) {
+  DCHECK(context3d);
+  DCHECK(client_);
+
+  scoped_ptr<OutputSurfaceCallbacks> original_callbacks = callbacks_.Pass();
+  scoped_ptr<WebKit::WebGraphicsContext3D> original_context3d =

[danakj, 2013/06/07 14:26:09]

mmm... so you already have a context3d, and now you're passing in a new and
different context3d? I'm not sure I'm understanding why this is so. Why wouldn't
the context3d always be null at this point?

[boliu, 2013/06/07 16:03:44]

It should be null in webview, but I coded the unittests to start with non-null
context3d. Changed tests to start in software mode, dropped this reset on
failure code, and add DCHECK(!context3d_)

+      context3d_.Pass();
+
+  bool success = false;
+  if (context3d->makeContextCurrent()) {
+    SetContext3D(context3d.Pass());
+    if (client_->DeferredInitialize(context_provider))
+      success = true;
+  }
+
+  if (!success)
+    SetContext3D(original_context3d.Pass());
+
+  return success;
+}
+
+void OutputSurface::SetContext3D(
+    scoped_ptr<WebKit::WebGraphicsContext3D> context3d) {
+  DCHECK(context3d);
+  DCHECK(client_);
+
+  string extensions_string = UTF16ToASCII(context3d->getString(GL_EXTENSIONS));
   vector<string> extensions_list;
   base::SplitString(extensions_string, ' ', &extensions_list);
   set<string> extensions(extensions_list.begin(), extensions_list.end());
-
   has_gl_discard_backbuffer_ =
       extensions.count("GL_CHROMIUM_discard_backbuffer") > 0;
 
+  context3d_ = context3d.Pass();
   callbacks_.reset(new OutputSurfaceCallbacks(client_));
   context3d_->setSwapBuffersCompleteCallbackCHROMIUM(callbacks_.get());
   context3d_->setContextLostCallback(callbacks_.get());
-
-  return true;
 }
 
 void OutputSurface::SendFrameToParentCompositor(CompositorFrame* frame) {
   NOTIMPLEMENTED();
 }
 
 void OutputSurface::EnsureBackbuffer() {
   DCHECK(context3d_);
   if (has_gl_discard_backbuffer_)
     context3d_->ensureBackbufferCHROMIUM();
@@ skipping 34 matching lines @@
 }
 
 void OutputSurface::PostSubBuffer(gfx::Rect rect,
                                   const ui::LatencyInfo& latency_info) {
   DCHECK(context3d_);
   context3d_->postSubBufferCHROMIUM(
       rect.x(), rect.y(), rect.width(), rect.height());
 }
 
 }  // namespace cc