cc::OutputSurfaceClient::InitializeForGL

cc/scheduler/scheduler_state_machine.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/scheduler/scheduler_state_machine.h"
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 
 namespace cc {
@@ skipping 412 matching lines @@
   output_surface_state_ = OUTPUT_SURFACE_LOST;
 }
 
 void SchedulerStateMachine::SetHasPendingTree(bool has_pending_tree) {
   has_pending_tree_ = has_pending_tree;
 }
 
 void SchedulerStateMachine::SetCanDraw(bool can) { can_draw_ = can; }
 
 void SchedulerStateMachine::DidCreateAndInitializeOutputSurface() {
-  DCHECK_EQ(output_surface_state_, OUTPUT_SURFACE_CREATING);
+  DCHECK(output_surface_state_ == OUTPUT_SURFACE_CREATING ||
+         output_surface_state_ == OUTPUT_SURFACE_ACTIVE);
+
+  // This can be called from LayerTreeHost::DeferredInitialize while an output

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

Pretty sure LTH isn't calling the scheduler :)

+  // surface  is already active.

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

nit: double space

+  if (output_surface_state_ == OUTPUT_SURFACE_ACTIVE)
+    return;
+
   output_surface_state_ = OUTPUT_SURFACE_ACTIVE;
 
   if (did_create_and_initialize_first_output_surface_) {
     // TODO(boliu): See if we can remove this when impl-side painting is always
     // on. Does anything on the main thread need to update after recreate?
     needs_commit_ = true;
     // If anything has requested a redraw, we don't want to actually draw
     // when the output surface is restored until things have a chance to
     // sort themselves out with a commit.
     needs_redraw_ = false;
   }
   did_create_and_initialize_first_output_surface_ = true;
 }
 
 bool SchedulerStateMachine::HasInitializedOutputSurface() const {
   return output_surface_state_ == OUTPUT_SURFACE_ACTIVE;
 }
 
 void SchedulerStateMachine::SetMaximumNumberOfFailedDrawsBeforeDrawIsForced(
     int num_draws) {
   maximum_number_of_failed_draws_before_draw_is_forced_ = num_draws;
 }
 
 }  // namespace cc