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

Side by Side Diff: content/browser/gpu/gpu_util.h

Issue 10959061: Revert 158076 - Implement blacklist's force GPU capability in dual GPU machines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/gpu/gpu_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
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 CONTENT_BROWSER_GPU_GPU_UTIL_H_
6 #define CONTENT_BROWSER_GPU_GPU_UTIL_H_ 6 #define CONTENT_BROWSER_GPU_GPU_UTIL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
13 #include "content/public/common/gpu_feature_type.h" 13 #include "content/public/common/gpu_feature_type.h"
14 #include "content/public/common/gpu_switching_option.h"
15 14
16 class GpuBlacklist; 15 class GpuBlacklist;
17 16
18 namespace gpu_util { 17 namespace gpu_util {
19 18
20 // Maps string to GpuFeatureType; returns GPU_FEATURE_TYPE_UNKNOWN if an 19 // Maps string to GpuFeatureType; returns GPU_FEATURE_TYPE_UNKNOWN if an
21 // unknown name is input (case-sensitive). 20 // unknown name is input (case-sensitive).
22 CONTENT_EXPORT content::GpuFeatureType StringToGpuFeatureType( 21 CONTENT_EXPORT content::GpuFeatureType StringToGpuFeatureType(
23 const std::string& feature_string); 22 const std::string& feature_string);
24 23
25 // Gets a string version of a feature type for use in about:gpu. Will yield 24 // Gets a string version of a feature type for use in about:gpu. Will yield
26 // strings from StringToGpuFeatureType, e.g. 25 // strings from StringToGpuFeatureType, e.g.
27 // GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS becomes "accelerated_2d_canvas" 26 // GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS becomes "accelerated_2d_canvas"
28 CONTENT_EXPORT std::string GpuFeatureTypeToString( 27 CONTENT_EXPORT std::string GpuFeatureTypeToString(
29 content::GpuFeatureType feature); 28 content::GpuFeatureType feature);
30 29
31 // Maps string to GpuSwitchingOption; returns GPU_SWITCHING_UNKNOWN if an 30 // Maps string to GpuSwitchingOption; returns GPU_SWITCHING_UNKNOWN if an
32 // unknown name is input (case-sensitive). 31 // unknown name is input (case-sensitive).
33 CONTENT_EXPORT content::GpuSwitchingOption StringToGpuSwitchingOption( 32 CONTENT_EXPORT content::GpuSwitchingOption StringToGpuSwitchingOption(
34 const std::string& switching_string); 33 const std::string& switching_string);
35 34
36 // Gets a string version of a GpuSwitchingOption.
37 CONTENT_EXPORT std::string GpuSwitchingOptionToString(
38 content::GpuSwitchingOption option);
39
40 // Send UMA histograms about the enabled features. 35 // Send UMA histograms about the enabled features.
41 CONTENT_EXPORT void UpdateStats( 36 CONTENT_EXPORT void UpdateStats(
42 const GpuBlacklist* blacklist, uint32 blacklisted_features); 37 const GpuBlacklist* blacklist, uint32 blacklisted_features);
43 38
44 } // namespace gpu_util 39 } // namespace gpu_util
45 40
46 #endif // CONTENT_BROWSER_GPU_GPU_UTIL_H_ 41 #endif // CONTENT_BROWSER_GPU_GPU_UTIL_H_
47 42
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/gpu/gpu_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698