cc::OutputSurfaceClient::InitializeForGL

cc/trees/single_thread_proxy.cc

 // Copyright 2011 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/trees/single_thread_proxy.h"
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "cc/base/thread.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource_update_controller.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
 
 scoped_ptr<Proxy> SingleThreadProxy::Create(LayerTreeHost* layer_tree_host) {
   return make_scoped_ptr(
       new SingleThreadProxy(layer_tree_host)).PassAs<Proxy>();
 }
 
 SingleThreadProxy::SingleThreadProxy(LayerTreeHost* layer_tree_host)
     : Proxy(scoped_ptr<Thread>(NULL)),
       layer_tree_host_(layer_tree_host),
       created_offscreen_context_provider_(false),
+      initializing_new_output_surface_(false),
       next_frame_is_newly_committed_frame_(false),
       inside_draw_(false) {
   TRACE_EVENT0("cc", "SingleThreadProxy::SingleThreadProxy");
   DCHECK(Proxy::IsMainThread());
   DCHECK(layer_tree_host);
 
   // Impl-side painting not supported without threaded compositing.
   CHECK(!layer_tree_host->settings().impl_side_painting)
       << "Threaded compositing must be enabled to use impl-side painting.";
 }
@@ skipping 92 matching lines @@
         layer_tree_host_impl_->resource_provider());
   }
 
   bool initialized;
   {
     DebugScopedSetImplThread impl(this);
 
     DCHECK(output_surface);
     initialized = layer_tree_host_impl_->InitializeRenderer(
         output_surface.Pass());
-    if (initialized) {
-      renderer_capabilities_for_main_thread_ =
-          layer_tree_host_impl_->GetRendererCapabilities();
-
-      layer_tree_host_impl_->resource_provider()->
-          set_offscreen_context_provider(offscreen_context_provider);
-    } else if (offscreen_context_provider) {
-      offscreen_context_provider->VerifyContexts();
-    }
+    initializing_new_output_surface_ = true;

[danakj, 2013/05/24 19:02:30]

You can use base::AutoReset<bool> for a bit more clarity/safety with this code
pattern. See TiledLayer::Update for an example.

However, I'd rather this was a parameter, passing through the is_deferred_init =
true from LTHI, or false from here.

+    DidUpdateCapabilitiesOnImplThread(initialized, offscreen_context_provider);
+    initializing_new_output_surface_ = false;
   }
 
   OnOutputSurfaceInitializeAttempted(initialized);
 }
 
+void SingleThreadProxy::DidUpdateCapabilitiesOnImplThread(
+    bool success,
+    scoped_refptr<ContextProvider> offscreen_context_provider) {
+  if (success) {
+    renderer_capabilities_for_main_thread_ =
+        layer_tree_host_impl_->GetRendererCapabilities();
+
+    layer_tree_host_impl_->resource_provider()->
+        set_offscreen_context_provider(offscreen_context_provider);
+
+    if (!initializing_new_output_surface_) {
+      DebugScopedSetMainThread main(this);
+      layer_tree_host_->DidUpdateCapabilities();
+    }
+  } else if (offscreen_context_provider) {
+    offscreen_context_provider->VerifyContexts();
+  }
+}
+
 void SingleThreadProxy::OnOutputSurfaceInitializeAttempted(bool success) {
   LayerTreeHost::CreateResult result =
       layer_tree_host_->OnCreateAndInitializeOutputSurfaceAttempted(success);
   if (result == LayerTreeHost::CreateFailedButTryAgain) {
     // Force another recreation attempt to happen by requesting another commit.
     SetNeedsCommit();
   }
 }
 
 const RendererCapabilities& SingleThreadProxy::GetRendererCapabilities() const {
@@ skipping 313 matching lines @@
 
 bool SingleThreadProxy::CommitPendingForTesting() { return false; }
 
 skia::RefPtr<SkPicture> SingleThreadProxy::CapturePicture() {
   // Impl-side painting only.
   NOTREACHED();
   return skia::RefPtr<SkPicture>();
 }
 
 }  // namespace cc