Fix compositor integration in ui/compositor

ui/compositor/compositor.h

 // 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.
 
 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
 #define UI_COMPOSITOR_COMPOSITOR_H_
 
 #include <string>
 
 #include "base/containers/hash_tables.h"
@@ skipping 51 matching lines @@
 
 // This class abstracts the creation of the 3D context for the compositor. It is
 // a global object.
 class COMPOSITOR_EXPORT ContextFactory {
  public:
   virtual ~ContextFactory() {}
 
   // Creates an output surface for the given compositor. The factory may keep
   // per-compositor data (e.g. a shared context), that needs to be cleaned up
   // by calling RemoveCompositor when the compositor gets destroyed.
-  virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
-      Compositor* compositor, bool software_fallback) = 0;
+  virtual void CreateOutputSurface(base::WeakPtr<Compositor> compositor,
+                                   bool software_fallback) = 0;
 
   // Creates a reflector that copies the content of the |mirrored_compositor|
   // onto |mirroring_layer|.
   virtual scoped_refptr<Reflector> CreateReflector(
       Compositor* mirrored_compositor,
       Layer* mirroring_layer) = 0;
   // Removes the reflector, which stops the mirroring.
   virtual void RemoveReflector(scoped_refptr<Reflector> reflector) = 0;
 
   // Return a reference to a shared offscreen context provider usable from the
@@ skipping 56 matching lines @@
     : NON_EXPORTED_BASE(public cc::LayerTreeHostClient),
       NON_EXPORTED_BASE(public cc::LayerTreeHostSingleThreadClient) {
  public:
   Compositor(gfx::AcceleratedWidget widget,
              ui::ContextFactory* context_factory,
              scoped_refptr<base::SingleThreadTaskRunner> task_runner);
   ~Compositor() override;
 
   ui::ContextFactory* context_factory() { return context_factory_; }
 
+  void SetOutputSurface(scoped_ptr<cc::OutputSurface> surface);
+
   // Schedules a redraw of the layer tree associated with this compositor.
   void ScheduleDraw();
 
   // Sets the root of the layer tree drawn by this Compositor. The root layer
   // must have no parent. The compositor's root layer is reset if the root layer
   // is destroyed. NULL can be passed to reset the root layer, in which case the
   // compositor will stop drawing anything.
   // The Compositor does not own the root layer.
   const Layer* root_layer() const { return root_layer_; }
   Layer* root_layer() { return root_layer_; }
@@ skipping 120 matching lines @@
   cc::SurfaceSequence InsertSurfaceSequenceForNextFrame();
 
   cc::SurfaceIdAllocator* surface_id_allocator() {
     return surface_id_allocator_.get();
   }
 
  private:
   friend class base::RefCounted<Compositor>;
   friend class CompositorLock;
 
-  enum {
-    OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK = 4,
-    MAX_OUTPUT_SURFACE_RETRIES = 5,
-  };
   // Called by CompositorLock.
   void UnlockCompositor();
 
   // Called to release any pending CompositorLock
   void CancelCompositorLock();
 
   // Notifies the compositor that compositing is complete.
   void NotifyEnd();
 
   gfx::Size size_;
@@ skipping 17 matching lines @@
   // The manager of vsync parameters for this compositor.
   scoped_refptr<CompositorVSyncManager> vsync_manager_;
 
   // The device scale factor of the monitor that this compositor is compositing
   // layers on.
   float device_scale_factor_;
 
   int last_started_frame_;
   int last_ended_frame_;
 
-  int num_failed_recreate_attempts_;
-
   bool disable_schedule_composite_;
 
   CompositorLock* compositor_lock_;
 
   // Prevent more than one draw from being scheduled.
   bool defer_draw_scheduling_;
 
   // Used to prevent Draw()s while a composite is in progress.
   bool waiting_on_compositing_end_;
   bool draw_on_compositing_end_;
   enum SwapState { SWAP_NONE, SWAP_POSTED, SWAP_COMPLETED };
   SwapState swap_state_;
 
   LayerAnimatorCollection layer_animator_collection_;
 
   base::WeakPtrFactory<Compositor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Compositor);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_COMPOSITOR_H_