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

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

Issue 11368084: Merge 165866 - Disable threaded compositing when texture sharing is blacklisted (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1312/src/
Patch Set: Created 8 years, 1 month 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
Index: content/browser/gpu/compositor_util.cc
===================================================================
--- content/browser/gpu/compositor_util.cc (revision 165954)
+++ content/browser/gpu/compositor_util.cc (working copy)
@@ -49,6 +49,15 @@
if (!CanDoAcceleratedCompositing())
return false;
+ const GpuDataManager* gpu_data_manager = GpuDataManager::GetInstance();
+ GpuFeatureType blacklisted_features =
+ gpu_data_manager->GetBlacklistedFeatures();
+ // Disallow threaded compositing when texture sharing is blacklisted since
+ // this triggers renderer-side readbacks for the thumbnailer / extensions.
+ // http://crbug.com/158747
+ if (blacklisted_features & GPU_FEATURE_TYPE_TEXTURE_SHARING)
+ return false;
+
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
// Command line switches take precedence over field trials.
« no previous file with comments | « chrome/test/gpu/gpu_feature_browsertest.cc ('k') | webkit/compositor_bindings/web_compositor_support_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698