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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 12079111: Allow separately blacklisting Stage3D baseline mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/resources/gpu/info_view.js ('k') | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b29dd835f2ce05db6531b82c539962d527be5fd9..4d3284ecc56ef6fc0668771059f2f5db4da043f8 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -461,6 +461,9 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
prefs.flash_stage3d_enabled =
GpuProcessHost::gpu_enabled() &&
!command_line.HasSwitch(switches::kDisableFlashStage3d);
+ prefs.flash_stage3d_baseline_enabled =
+ GpuProcessHost::gpu_enabled() &&
+ !command_line.HasSwitch(switches::kDisableFlashStage3d);
prefs.gl_multisampling_enabled =
!command_line.HasSwitch(switches::kDisableGLMultisampling);
@@ -582,8 +585,12 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
prefs.experimental_webgl_enabled = false;
if (blacklist_type & GPU_FEATURE_TYPE_FLASH3D)
prefs.flash_3d_enabled = false;
- if (blacklist_type & GPU_FEATURE_TYPE_FLASH_STAGE3D)
+ if (blacklist_type & GPU_FEATURE_TYPE_FLASH_STAGE3D) {
prefs.flash_stage3d_enabled = false;
+ prefs.flash_stage3d_baseline_enabled = false;
+ }
+ if (blacklist_type & GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE)
+ prefs.flash_stage3d_baseline_enabled = false;
if (blacklist_type & GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)
prefs.accelerated_2d_canvas_enabled = false;
if (blacklist_type & GPU_FEATURE_TYPE_MULTISAMPLING)
« no previous file with comments | « content/browser/resources/gpu/info_view.js ('k') | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698