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

Unified Diff: ui/compositor/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: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index e45f215869b8c01f2783420d4926b29dc17208e7..79f464199e7653e7dd3a870035848c0b069ae8d0 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -74,7 +74,7 @@ class COMPOSITOR_EXPORT ContextFactory {
bool software_fallback) = 0;
// Creates a reflector that copies the content of the |mirrored_compositor|
- // onto |mirroing_layer|.
+ // onto |mirroring_layer|.
virtual scoped_refptr<Reflector> CreateReflector(
Compositor* mirrored_compositor,
Layer* mirroring_layer) = 0;
@@ -251,8 +251,9 @@ class COMPOSITOR_EXPORT Compositor
void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
float page_scale,
float top_controls_delta) override {}
- void RequestNewOutputSurface(bool fallback) override;
- void DidInitializeOutputSurface() override {}
+ void RequestNewOutputSurface() override;
+ void DidInitializeOutputSurface() override;
+ void DidFailToInitializeOutputSurface() override;
void WillCommit() override {}
void DidCommit() override;
void DidCommitAndDrawFrame() override;
@@ -285,6 +286,11 @@ class COMPOSITOR_EXPORT Compositor
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();
@@ -321,6 +327,8 @@ class COMPOSITOR_EXPORT Compositor
int last_started_frame_;
int last_ended_frame_;
+ int num_failed_recreate_attempts_;
+
bool disable_schedule_composite_;
CompositorLock* compositor_lock_;

Powered by Google App Engine
This is Rietveld 408576698