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

Side by Side Diff: gpu/config/gpu_control_list.h

Issue 1252293002: Revert of 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: 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 unified diff | Download patch
« no previous file with comments | « content/gpu/gpu_main.cc ('k') | gpu/config/gpu_control_list.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef GPU_CONFIG_GPU_CONTROL_LIST_H_ 5 #ifndef GPU_CONFIG_GPU_CONTROL_LIST_H_
6 #define GPU_CONFIG_GPU_CONTROL_LIST_H_ 6 #define GPU_CONFIG_GPU_CONTROL_LIST_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 393
394 bool SetMachineModelVersionInfo(const std::string& version_op, 394 bool SetMachineModelVersionInfo(const std::string& version_op,
395 const std::string& version_string, 395 const std::string& version_string,
396 const std::string& version_string2); 396 const std::string& version_string2);
397 397
398 bool SetGpuCountInfo(const std::string& op, 398 bool SetGpuCountInfo(const std::string& op,
399 const std::string& int_string, 399 const std::string& int_string,
400 const std::string& int_string2); 400 const std::string& int_string2);
401 401
402 void SetDirectRenderingInfo(bool value); 402 void SetDirectRenderingInfo(bool value);
403 void SetInProcessGPUInfo(bool value);
404 403
405 bool SetFeatures(const std::vector<std::string>& features, 404 bool SetFeatures(const std::vector<std::string>& features,
406 const FeatureMap& feature_map, 405 const FeatureMap& feature_map,
407 bool supports_feature_type_all); 406 bool supports_feature_type_all);
408 407
409 void AddException(ScopedGpuControlListEntry exception); 408 void AddException(ScopedGpuControlListEntry exception);
410 409
411 // Return true if GL_VERSION string does not fit the entry info 410 // Return true if GL_VERSION string does not fit the entry info
412 // on GL type and GL version. 411 // on GL type and GL version.
413 bool GLVersionInfoMismatch(const std::string& gl_version) const; 412 bool GLVersionInfoMismatch(const std::string& gl_version) const;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 std::string gl_extensions_info_; 449 std::string gl_extensions_info_;
451 scoped_ptr<IntInfo> gl_reset_notification_strategy_info_; 450 scoped_ptr<IntInfo> gl_reset_notification_strategy_info_;
452 std::string cpu_brand_; 451 std::string cpu_brand_;
453 scoped_ptr<FloatInfo> perf_graphics_info_; 452 scoped_ptr<FloatInfo> perf_graphics_info_;
454 scoped_ptr<FloatInfo> perf_gaming_info_; 453 scoped_ptr<FloatInfo> perf_gaming_info_;
455 scoped_ptr<FloatInfo> perf_overall_info_; 454 scoped_ptr<FloatInfo> perf_overall_info_;
456 std::vector<std::string> machine_model_name_list_; 455 std::vector<std::string> machine_model_name_list_;
457 scoped_ptr<VersionInfo> machine_model_version_info_; 456 scoped_ptr<VersionInfo> machine_model_version_info_;
458 scoped_ptr<IntInfo> gpu_count_info_; 457 scoped_ptr<IntInfo> gpu_count_info_;
459 scoped_ptr<BoolInfo> direct_rendering_info_; 458 scoped_ptr<BoolInfo> direct_rendering_info_;
460 scoped_ptr<BoolInfo> in_process_gpu_info_;
461 std::set<int> features_; 459 std::set<int> features_;
462 std::vector<ScopedGpuControlListEntry> exceptions_; 460 std::vector<ScopedGpuControlListEntry> exceptions_;
463 }; 461 };
464 462
465 // Gets the current OS type. 463 // Gets the current OS type.
466 static OsType GetOsType(); 464 static OsType GetOsType();
467 465
468 bool LoadList(const base::DictionaryValue& parsed_json, OsFilter os_filter); 466 bool LoadList(const base::DictionaryValue& parsed_json, OsFilter os_filter);
469 467
470 void Clear(); 468 void Clear();
(...skipping 17 matching lines...) Expand all
488 bool supports_feature_type_all_; 486 bool supports_feature_type_all_;
489 487
490 bool control_list_logging_enabled_; 488 bool control_list_logging_enabled_;
491 std::string control_list_logging_name_; 489 std::string control_list_logging_name_;
492 }; 490 };
493 491
494 } // namespace gpu 492 } // namespace gpu
495 493
496 #endif // GPU_CONFIG_GPU_CONTROL_LIST_H_ 494 #endif // GPU_CONFIG_GPU_CONTROL_LIST_H_
497 495
OLDNEW
« no previous file with comments | « content/gpu/gpu_main.cc ('k') | gpu/config/gpu_control_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698