| 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 #ifndef CONTENT_BROWSER_GPU_GPU_UTIL_H_ | 5 #ifndef GPU_CONFIG_GPU_UTIL_H_ |
| 6 #define CONTENT_BROWSER_GPU_GPU_UTIL_H_ | 6 #define GPU_CONFIG_GPU_UTIL_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/basictypes.h" | |
| 12 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 13 #include "content/common/content_export.h" | 12 #include "gpu/config/gpu_switching_option.h" |
| 14 #include "content/public/common/gpu_switching_option.h" | 13 #include "gpu/gpu_export.h" |
| 15 | 14 |
| 16 namespace content { | 15 namespace gpu { |
| 17 class GpuBlacklist; | |
| 18 | 16 |
| 19 // Maps string to GpuSwitchingOption; returns GPU_SWITCHING_UNKNOWN if an | 17 // Maps string to GpuSwitchingOption; returns GPU_SWITCHING_UNKNOWN if an |
| 20 // unknown name is input (case-sensitive). | 18 // unknown name is input (case-sensitive). |
| 21 CONTENT_EXPORT GpuSwitchingOption StringToGpuSwitchingOption( | 19 GPU_EXPORT GpuSwitchingOption StringToGpuSwitchingOption( |
| 22 const std::string& switching_string); | 20 const std::string& switching_string); |
| 23 | 21 |
| 24 // Gets a string version of a GpuSwitchingOption. | 22 // Gets a string version of a GpuSwitchingOption. |
| 25 CONTENT_EXPORT std::string GpuSwitchingOptionToString( | 23 GPU_EXPORT std::string GpuSwitchingOptionToString(GpuSwitchingOption option); |
| 26 GpuSwitchingOption option); | |
| 27 | |
| 28 // Send UMA histograms about the enabled features. | |
| 29 CONTENT_EXPORT void UpdateStats( | |
| 30 const GpuBlacklist* blacklist, const std::set<int>& blacklisted_features); | |
| 31 | 24 |
| 32 // Merge features in src into dst. | 25 // Merge features in src into dst. |
| 33 CONTENT_EXPORT void MergeFeatureSets( | 26 GPU_EXPORT void MergeFeatureSets( |
| 34 std::set<int>* dst, const std::set<int>& src); | 27 std::set<int>* dst, const std::set<int>& src); |
| 35 | 28 |
| 36 } // namespace content | 29 } // namespace gpu |
| 37 | 30 |
| 38 #endif // CONTENT_BROWSER_GPU_GPU_UTIL_H_ | 31 #endif // GPU_CONFIG_GPU_UTIL_H_ |
| 39 | 32 |
| OLD | NEW |