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

Unified Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 2237053002: mus: Always use the GPU compositor for mus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 months 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 334b10c04662d48f227bfffcbd408266b92f24a6..93ecf0e05e52081706fd4b8c92a67c5eb9467016 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -268,6 +268,8 @@ static bool ShouldCreateGpuOutputSurface(ui::Compositor* compositor) {
// Software fallback does not happen on Chrome OS.
return true;
#endif
+ if (IsUsingMus())
+ return true;
#if defined(OS_WIN)
if (::GetProp(compositor->widget(), kForceSoftwareCompositor) &&
@@ -329,10 +331,12 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
DCHECK(data);
if (num_attempts > kNumRetriesBeforeSoftwareFallback) {
+ bool fatal = IsUsingMus();
#if defined(OS_CHROMEOS)
- LOG(FATAL) << "Unable to create a UI graphics context, and cannot use "
- << "software compositing on ChromeOS.";
+ fatal = true;
#endif
+ LOG_IF(FATAL, fatal) << "Unable to create a UI graphics context, and "
+ << "cannot use software compositing on ChromeOS.";
create_gpu_output_surface = false;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698