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

Unified Diff: ui/compositor/compositor.cc

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
« no previous file with comments | « ui/compositor/compositor.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index f67632290a3eeaee1a97549d84b572e99bfe4605..088f6ec809101871c0de31ff29299f141106acee 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -77,6 +77,7 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
device_scale_factor_(0.0f),
last_started_frame_(0),
last_ended_frame_(0),
+ num_failed_recreate_attempts_(0),
disable_schedule_composite_(false),
compositor_lock_(NULL),
defer_draw_scheduling_(false),
@@ -356,11 +357,30 @@ void Compositor::Layout() {
disable_schedule_composite_ = false;
}
-void Compositor::RequestNewOutputSurface(bool fallback) {
+void Compositor::RequestNewOutputSurface() {
+ bool fallback =
+ num_failed_recreate_attempts_ >= OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK;
context_factory_->CreateOutputSurface(weak_ptr_factory_.GetWeakPtr(),
fallback);
}
+void Compositor::DidInitializeOutputSurface() {
+ num_failed_recreate_attempts_ = 0;
+}
+
+void Compositor::DidFailToInitializeOutputSurface() {
+ num_failed_recreate_attempts_++;
+
+ // Tolerate a certain number of recreation failures to work around races
+ // in the output-surface-lost machinery.
+ if (num_failed_recreate_attempts_ >= MAX_OUTPUT_SURFACE_RETRIES)
+ LOG(FATAL) << "Failed to create a fallback OutputSurface.";
+
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(&Compositor::RequestNewOutputSurface,
+ weak_ptr_factory_.GetWeakPtr()));
+}
+
void Compositor::DidCommit() {
DCHECK(!IsLocked());
FOR_EACH_OBSERVER(CompositorObserver,
« no previous file with comments | « ui/compositor/compositor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698