| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_blacklist.h" | 5 #include "content/browser/gpu_blacklist.h" |
| 6 | 6 |
| 7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/string_piece.h" | 10 #include "base/string_piece.h" |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 if (size == 0) | 426 if (size == 0) |
| 427 return false; | 427 return false; |
| 428 uint32 flags = 0; | 428 uint32 flags = 0; |
| 429 for (size_t i = 0; i < size; ++i) { | 429 for (size_t i = 0; i < size; ++i) { |
| 430 GpuFeatureFlags::GpuFeatureType type = | 430 GpuFeatureFlags::GpuFeatureType type = |
| 431 GpuFeatureFlags::StringToGpuFeatureType(blacklisted_features[i]); | 431 GpuFeatureFlags::StringToGpuFeatureType(blacklisted_features[i]); |
| 432 switch (type) { | 432 switch (type) { |
| 433 case GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas: | 433 case GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas: |
| 434 case GpuFeatureFlags::kGpuFeatureAcceleratedCompositing: | 434 case GpuFeatureFlags::kGpuFeatureAcceleratedCompositing: |
| 435 case GpuFeatureFlags::kGpuFeatureWebgl: | 435 case GpuFeatureFlags::kGpuFeatureWebgl: |
| 436 case GpuFeatureFlags::kGpuFeatureMultisampling: |
| 436 case GpuFeatureFlags::kGpuFeatureAll: | 437 case GpuFeatureFlags::kGpuFeatureAll: |
| 437 flags |= type; | 438 flags |= type; |
| 438 break; | 439 break; |
| 439 case GpuFeatureFlags::kGpuFeatureUnknown: | 440 case GpuFeatureFlags::kGpuFeatureUnknown: |
| 440 return false; | 441 return false; |
| 441 } | 442 } |
| 442 } | 443 } |
| 443 feature_flags_.reset(new GpuFeatureFlags()); | 444 feature_flags_.reset(new GpuFeatureFlags()); |
| 444 feature_flags_->set_flags(flags); | 445 feature_flags_->set_flags(flags); |
| 445 return true; | 446 return true; |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 #endif | 678 #endif |
| 678 } | 679 } |
| 679 | 680 |
| 680 void GpuBlacklist::Clear() { | 681 void GpuBlacklist::Clear() { |
| 681 for (size_t i = 0; i < blacklist_.size(); ++i) | 682 for (size_t i = 0; i < blacklist_.size(); ++i) |
| 682 delete blacklist_[i]; | 683 delete blacklist_[i]; |
| 683 blacklist_.clear(); | 684 blacklist_.clear(); |
| 684 active_entries_.clear(); | 685 active_entries_.clear(); |
| 685 } | 686 } |
| 686 | 687 |
| OLD | NEW |