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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/gpu/gpu_data_manager_impl_private.cc

Issue 2096843002: mus+ash: Enable Chrome HW rendering in mus+ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 4 years, 5 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 | « content/browser/gpu/browser_gpu_channel_host_factory.cc ('k') | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_data_manager_impl_private.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index 77b9b2aa1f3f5e9506f3d926d87a24a0bb267b54..892b1b3c48c63bcaa84d02e529c9ee975887de92 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -49,7 +49,8 @@
#include "base/win/windows_version.h"
#endif // OS_WIN
#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
-#include "services/shell/runner/common/client_util.h"
+#include "services/shell/runner/common/client_util.h" // nogncheck
+#include "services/ui/common/gpu_service.h" // nogncheck
#endif
namespace content {
@@ -267,7 +268,7 @@ enum BlockStatusHistogram {
bool ShouldDisableHardwareAcceleration() {
#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
// TODO(rjkroege): Remove this when https://crbug.com/602519 is fixed.
- if (shell::ShellIsRemote())
+ if (shell::ShellIsRemote() && !ui::GpuService::UseChromeGpuCommandBuffer())
return true;
#endif
return base::CommandLine::ForCurrentProcess()->HasSwitch(
« no previous file with comments | « content/browser/gpu/browser_gpu_channel_host_factory.cc ('k') | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698