Move output surface fallback from cc to embedders

content/renderer/gpu/render_widget_compositor.h

Index: content/renderer/gpu/render_widget_compositor.h
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
index 5da9f0bc7b9695299c7f430c24d32cf32eb29f39..8c83d225e0ceb804291b7e9000baa5cc2d5dba76 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -141,8 +141,9 @@ class CONTENT_EXPORT RenderWidgetCompositor
   void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
                            float page_scale,
                            float top_controls_delta) override;
-  void RequestNewOutputSurface(bool fallback) override;
+  void RequestNewOutputSurface() override;
   void DidInitializeOutputSurface() override;
+  void DidFailToInitializeOutputSurface() override;
   void WillCommit() override;
   void DidCommit() override;
   void DidCommitAndDrawFrame() override;
@@ -154,11 +155,20 @@ class CONTENT_EXPORT RenderWidgetCompositor
   void DidPostSwapBuffers() override;
   void DidAbortSwapBuffers() override;
 
- private:
+  enum {

[no sievers, 2014/12/02 20:38:07]

nit: should it be "const int kMaxOutSurfaceRetries" and
"kOutputSurfaceRetriesBeforeFallback"?

[enne (OOO), 2014/12/02 21:09:33]

I wanted these to be accessible to tests and didn't want to add static storage
for them.  Can you do that with consts these days?

+   OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK = 4,
+   MAX_OUTPUT_SURFACE_RETRIES = 5,
+  };
+
+ protected:
   RenderWidgetCompositor(RenderWidget* widget, bool threaded);
 
-  void Initialize(cc::LayerTreeSettings settings);
+  void Initialize(const cc::LayerTreeSettings& settings);
+
+  cc::LayerTreeHost* layer_tree_host() { return layer_tree_host_.get(); }
 
+ private:
+  int num_failed_recreate_attempts_;
   bool threaded_;
   RenderWidget* widget_;
   scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
@@ -169,6 +179,8 @@ class CONTENT_EXPORT RenderWidgetCompositor
   base::TimeTicks begin_main_frame_time_;
   // The time interval between BeginMainFrame calls, provided by the scheduler.
   base::TimeDelta begin_main_frame_interval_;
+
+  base::WeakPtrFactory<RenderWidgetCompositor> weak_factory_;
 };
 
 }  // namespace content