| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "content/browser/gpu/gpu_blacklist.h" | 5 #include "content/browser/gpu/gpu_blacklist.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| (...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 764 gpu_util::StringToGpuFeatureType(blacklisted_features[i]); | 764 gpu_util::StringToGpuFeatureType(blacklisted_features[i]); |
| 765 switch (type) { | 765 switch (type) { |
| 766 case content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS: | 766 case content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS: |
| 767 case content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING: | 767 case content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING: |
| 768 case content::GPU_FEATURE_TYPE_WEBGL: | 768 case content::GPU_FEATURE_TYPE_WEBGL: |
| 769 case content::GPU_FEATURE_TYPE_MULTISAMPLING: | 769 case content::GPU_FEATURE_TYPE_MULTISAMPLING: |
| 770 case content::GPU_FEATURE_TYPE_FLASH3D: | 770 case content::GPU_FEATURE_TYPE_FLASH3D: |
| 771 case content::GPU_FEATURE_TYPE_FLASH_STAGE3D: | 771 case content::GPU_FEATURE_TYPE_FLASH_STAGE3D: |
| 772 case content::GPU_FEATURE_TYPE_TEXTURE_SHARING: | 772 case content::GPU_FEATURE_TYPE_TEXTURE_SHARING: |
| 773 case content::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE: | 773 case content::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE: |
| 774 case content::GPU_FEATURE_TYPE_PANEL_FITTING: |
| 774 case content::GPU_FEATURE_TYPE_ALL: | 775 case content::GPU_FEATURE_TYPE_ALL: |
| 775 feature_type |= type; | 776 feature_type |= type; |
| 776 break; | 777 break; |
| 777 case content::GPU_FEATURE_TYPE_UNKNOWN: | 778 case content::GPU_FEATURE_TYPE_UNKNOWN: |
| 778 contains_unknown_features_ = true; | 779 contains_unknown_features_ = true; |
| 779 break; | 780 break; |
| 780 } | 781 } |
| 781 } | 782 } |
| 782 feature_type_ = static_cast<GpuFeatureType>(feature_type); | 783 feature_type_ = static_cast<GpuFeatureType>(feature_type); |
| 783 return true; | 784 return true; |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1155 if (op == ">") | 1156 if (op == ">") |
| 1156 return kGT; | 1157 return kGT; |
| 1157 if (op == ">=") | 1158 if (op == ">=") |
| 1158 return kGE; | 1159 return kGE; |
| 1159 if (op == "any") | 1160 if (op == "any") |
| 1160 return kAny; | 1161 return kAny; |
| 1161 if (op == "between") | 1162 if (op == "between") |
| 1162 return kBetween; | 1163 return kBetween; |
| 1163 return kUnknown; | 1164 return kUnknown; |
| 1164 } | 1165 } |
| OLD | NEW |