cc::OutputSurfaceClient::InitializeForGL

cc/trees/layer_tree_host_impl.cc

Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index ef2b53dcc00a6cb2bbbf6d8d38bfd3307cfa55c8..3ed79cede7756c5aba9281b8ecf972ec68a80473 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1456,7 +1456,15 @@ bool LayerTreeHostImpl::InitializeRenderer(
   if (!output_surface->BindToClient(this))
     return false;
 
-  if (output_surface->capabilities().deferred_gl_initialization) {
+  return DoInitializeRenderer(output_surface.Pass(),
+                              false /* is_deferred_init */);
+}
+
+bool LayerTreeHostImpl::DoInitializeRenderer(
+    scoped_ptr<OutputSurface> output_surface,
+    bool is_deferred_init) {
+  if (output_surface->capabilities().deferred_gl_initialization &&
+      !is_deferred_init) {
     // TODO(joth): Defer creating the Renderer too, until GL is initialized.
     // See http://crbug.com/230197
     renderer_ = SoftwareRenderer::Create(this, output_surface.get(), NULL);
@@ -1513,6 +1521,22 @@ bool LayerTreeHostImpl::InitializeRenderer(
   return true;
 }
 
+bool LayerTreeHostImpl::DeferredInitialize(
+    scoped_refptr<ContextProvider> offscreen_context_provider) {
+  DCHECK(output_surface_->capabilities().deferred_gl_initialization);
+  DCHECK(output_surface_->context3d());
+
+  // TODO(boliu): This is temporary until proper resource clean up is possible
+  // without resetting |tile_manager_| or |resource_provider_|.
+  DCHECK(!resource_provider_);
+
+  bool success =
+      DoInitializeRenderer(output_surface_.Pass(), true /* is_deferred_init */);
+  client_->DidTryInitializeRendererOnImplThread(success,
+                                                offscreen_context_provider);
+  return success;

[danakj, 2013/06/05 21:53:32]

AIUI, the output surface will never have an offscreen provider to give here,
since it can't go to the main thread. So when you switch to hardware mode,
things like CSS filters are going to disappear until you do a commit. So.. you
probably want to set needs commit here?

[boliu, 2013/06/05 22:17:27]

If the offscreen context is the only thing for this needs commit, then I would
leave it out for now. I think we can should be able to get a context here
"eventually".

+}
+
 void LayerTreeHostImpl::SetViewportSize(gfx::Size device_viewport_size) {
   if (device_viewport_size == device_viewport_size_)
     return;