Revert 238458 "cc: Defer first OutputSurface creation until clie..."

trunk/src/cc/trees/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/thread_proxy.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 249 matching lines @@
 void ThreadProxy::UpdateBackgroundAnimateTicking() {
   layer_tree_host_impl_->UpdateBackgroundAnimateTicking(
       !scheduler_on_impl_thread_->WillDrawIfNeeded() &&
       layer_tree_host_impl_->active_tree()->root_layer());
 }
 
 void ThreadProxy::DoCreateAndInitializeOutputSurface() {
   TRACE_EVENT0("cc", "ThreadProxy::DoCreateAndInitializeOutputSurface");
   DCHECK(IsMainThread());
 
-  scoped_ptr<OutputSurface> output_surface =
-      layer_tree_host()->CreateOutputSurface();
+  scoped_ptr<OutputSurface> output_surface = first_output_surface_.Pass();
+  if (!output_surface)
+    output_surface = layer_tree_host()->CreateOutputSurface();
 
   RendererCapabilities capabilities;
   bool success = !!output_surface;
   if (!success) {
     OnOutputSurfaceInitializeAttempted(false, capabilities);
     return;
   }
 
   scoped_refptr<ContextProvider> offscreen_context_provider;
   if (created_offscreen_context_provider_) {
@@ skipping 352 matching lines @@
   DCHECK(IsMainThread() || IsMainThreadBlocked());
   return layer_tree_host()->contents_texture_manager();
 }
 
 PrioritizedResourceManager*
 ThreadProxy::contents_texture_manager_on_impl_thread() {
   DCHECK(IsImplThread());
   return contents_texture_manager_unsafe_;
 }
 
-void ThreadProxy::Start() {
+void ThreadProxy::Start(scoped_ptr<OutputSurface> first_output_surface) {
   DCHECK(IsMainThread());
   DCHECK(Proxy::HasImplThread());
+  DCHECK(first_output_surface);
 
   // Create LayerTreeHostImpl.
   DebugScopedSetMainThreadBlocked main_thread_blocked(this);
   CompletionEvent completion;
   Proxy::ImplThreadTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&ThreadProxy::InitializeImplOnImplThread,
                  base::Unretained(this),
                  &completion));
   completion.Wait();
 
   main_thread_weak_ptr_ = weak_factory_.GetWeakPtr();
+  first_output_surface_ = first_output_surface.Pass();
 
   started_ = true;
 }
 
 void ThreadProxy::Stop() {
   TRACE_EVENT0("cc", "ThreadProxy::Stop");
   DCHECK(IsMainThread());
   DCHECK(started_);
 
   // Synchronously finishes pending GL operations and deletes the impl.
@@ skipping 980 matching lines @@
   commit_to_activate_duration_history_.InsertSample(
       base::TimeTicks::HighResNow() - commit_complete_time_);
 }
 
 void ThreadProxy::DidManageTiles() {
   DCHECK(IsImplThread());
   scheduler_on_impl_thread_->DidManageTiles();
 }
 
 }  // namespace cc