content/browser/renderer_host/render_view_host_impl.cc - Issue 212863004: Revert of content: Avoid duplicating the logic used to determine GPU features.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 212863004: Revert of content: Avoid duplicating the logic used to determine GPU features. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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/renderer_host/render_process_host_impl.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_view_host_impl.cc

diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc

index edf50b85127d57a67df1bf55d7ba7f4fc74d686c..1324551d2fc3908b82c03279e343c38ddf17bb8f 100644

--- a/content/browser/renderer_host/render_view_host_impl.cc

+++ b/content/browser/renderer_host/render_view_host_impl.cc

@@ -414,7 +414,9 @@

prefs.accelerated_compositing_enabled =

GpuProcessHost::gpu_enabled() &&

!command_line.HasSwitch(switches::kDisableAcceleratedCompositing);

- prefs.force_compositing_mode = content::IsForceCompositingModeEnabled();

+ prefs.force_compositing_mode =

+ content::IsForceCompositingModeEnabled() &&

+ !command_line.HasSwitch(switches::kDisableForceCompositingMode);

prefs.accelerated_2d_canvas_enabled =

GpuProcessHost::gpu_enabled() &&

!command_line.HasSwitch(switches::kDisableAccelerated2dCanvas);