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

Unified Diff: gpu/config/gpu_control_list.cc

Issue 1247093006: Allow WebGL on Android if the GPU has it's own process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added back in EXT_robustness exceptions Created 5 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 | « gpu/config/gpu_control_list.h ('k') | gpu/config/gpu_control_list_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/gpu_control_list.cc
diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc
index 401379dccded5e92d56ab3a67ebe2372c285e8f4..1fbf0b6f5aa2427243a9150757b800afe5fe79b5 100644
--- a/gpu/config/gpu_control_list.cc
+++ b/gpu/config/gpu_control_list.cc
@@ -723,6 +723,12 @@ GpuControlList::GpuControlListEntry::GetEntryFromValue(
dictionary_entry_count++;
}
+ bool in_process_gpu;
+ if (value->GetBoolean("in_process_gpu", &in_process_gpu)) {
+ entry->SetInProcessGPUInfo(in_process_gpu);
+ dictionary_entry_count++;
+ }
+
if (top_level) {
const base::ListValue* feature_value = NULL;
if (value->GetList("features", &feature_value)) {
@@ -980,6 +986,10 @@ void GpuControlList::GpuControlListEntry::SetDirectRenderingInfo(bool value) {
direct_rendering_info_.reset(new BoolInfo(value));
}
+void GpuControlList::GpuControlListEntry::SetInProcessGPUInfo(bool value) {
+ in_process_gpu_info_.reset(new BoolInfo(value));
+}
+
bool GpuControlList::GpuControlListEntry::SetFeatures(
const std::vector<std::string>& feature_strings,
const FeatureMap& feature_map,
@@ -1243,6 +1253,9 @@ bool GpuControlList::GpuControlListEntry::Contains(
if (direct_rendering_info_.get() != NULL &&
!direct_rendering_info_->Contains(gpu_info.direct_rendering))
return false;
+ if (in_process_gpu_info_.get() != NULL &&
+ !in_process_gpu_info_->Contains(gpu_info.in_process_gpu))
+ return false;
if (!cpu_brand_.empty()) {
base::CPU cpu_info;
if (StringMismatch(cpu_info.cpu_brand(), cpu_brand_))
« no previous file with comments | « gpu/config/gpu_control_list.h ('k') | gpu/config/gpu_control_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698