Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1779)

Unified Diff: content/renderer/gpu/render_widget_compositor.h

Issue 738983002: Move output surface fallback from cc to embedders (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ec890d451761223d36c7261d5e5c193302ed8b81..1f89c727bfb65c294c2fca7611595e050d1ccda0 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -143,8 +143,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;
@@ -156,11 +157,20 @@ class CONTENT_EXPORT RenderWidgetCompositor
void DidPostSwapBuffers() override;
void DidAbortSwapBuffers() override;
- private:
+ enum {
+ 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_;
@@ -171,6 +181,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
« no previous file with comments | « content/browser/renderer_host/compositor_impl_android.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698