Fix compositor integration in ui/compositor

ui/compositor/compositor.cc

 // Copyright (c) 2012 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 "ui/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 185 matching lines @@
   if (root_layer_)
     root_layer_->SetCompositor(NULL);
 
   // Stop all outstanding draws before telling the ContextFactory to tear
   // down any contexts that the |host_| may rely upon.
   host_.reset();
 
   context_factory_->RemoveCompositor(this);
 }
 
+void Compositor::SetOutputSurface(scoped_ptr<cc::OutputSurface> surface) {
+  host_->SetOutputSurface(surface.Pass());
+}
+
 void Compositor::ScheduleDraw() {
   if (compositor_thread_loop_.get()) {
     host_->SetNeedsCommit();
   } else if (!defer_draw_scheduling_) {
     defer_draw_scheduling_ = true;
     task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&Compositor::Draw, weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void Compositor::DidInitializeOutputSurface() {
-  num_failed_recreate_attempts_ = 0;
 }
 
 void Compositor::DidFailToInitializeOutputSurface() {
-  num_failed_recreate_attempts_++;
-
-  // Tolerate a certain number of recreation failures to work around races
-  // in the output-surface-lost machinery.
-  if (num_failed_recreate_attempts_ >= MAX_OUTPUT_SURFACE_RETRIES)
-    LOG(FATAL) << "Failed to create a fallback OutputSurface.";
-
-  base::MessageLoop::current()->PostTask(
-      FROM_HERE, base::Bind(&Compositor::RequestNewOutputSurface,
-                            weak_ptr_factory_.GetWeakPtr()));
+  NOTREACHED() << "We don't support fallback";
 }
 
 void Compositor::SetRootLayer(Layer* root_layer) {
   if (root_layer_ == root_layer)
     return;
   if (root_layer_)
     root_layer_->SetCompositor(NULL);
   root_layer_ = root_layer;
   if (root_layer_ && !root_layer_->GetCompositor())
     root_layer_->SetCompositor(this);
@@ skipping 136 matching lines @@
 void Compositor::Layout() {
   // We're sending damage that will be addressed during this composite
   // cycle, so we don't need to schedule another composite to address it.
   disable_schedule_composite_ = true;
   if (root_layer_)
     root_layer_->SendDamagedRects();
   disable_schedule_composite_ = false;
 }
 
 void Compositor::RequestNewOutputSurface() {
-  bool fallback =
-      num_failed_recreate_attempts_ >= OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK;
-  context_factory_->CreateOutputSurface(weak_ptr_factory_.GetWeakPtr().get(),
+  bool fallback = false;
+  context_factory_->CreateOutputSurface(weak_ptr_factory_.GetWeakPtr(),
                                         fallback);
 }
 
 void Compositor::DidCommit() {
   DCHECK(!IsLocked());
   FOR_EACH_OBSERVER(CompositorObserver,
                     observer_list_,
                     OnCompositingDidCommit(this));
 }
 
@@ skipping 98 matching lines @@
     // Call ScheduleDraw() instead of Draw() in order to allow other
     // CompositorObservers to be notified before starting another
     // draw cycle.
     ScheduleDraw();
   }
   FOR_EACH_OBSERVER(
       CompositorObserver, observer_list_, OnCompositingEnded(this));
 }
 
 }  // namespace ui