Move output surface fallback from cc to embedders

content/renderer/gpu/render_widget_compositor.h

 // Copyright (c) 2013 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 CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
@@ skipping 123 matching lines @@
   void DidBeginMainFrame() override;
   void BeginMainFrame(const cc::BeginFrameArgs& args) override;
   void Layout() override;
   void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
                            const gfx::Vector2d& outer_delta,
                            float page_scale,
                            float top_controls_delta) override;
   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;
   void DidCompleteSwapBuffers() override;
   void RateLimitSharedMainThreadContext() override;
 
   // cc::LayerTreeHostSingleThreadClient implementation.
   void ScheduleAnimation() override;
   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_;
 
   scoped_ptr<cc::CopyOutputRequest> temporary_copy_output_request_;
 
   bool send_v8_idle_notification_after_commit_;
   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
 
 #endif  // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_