diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-14 05:35:47 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-14 05:35:47 +0000 |
| commit | b260e76487a755b39f54d633649557c5d30b64e8 (patch) | |
| tree | e4e5fd9642d10c2345a9b4fafdc6ae91d3b7c279 /gpu/config/gpu_control_list.h | |
| parent | 8667d8701a62a2096759cc9c2bbb50db07918a9b (diff) | |
| download | chromium_src-b260e76487a755b39f54d633649557c5d30b64e8.zip chromium_src-b260e76487a755b39f54d633649557c5d30b64e8.tar.gz chromium_src-b260e76487a755b39f54d633649557c5d30b64e8.tar.bz2 | |
Revert 228401 "Enable GPU control lists in tests."
I'm sorry Mr CL, but you may have broken ImageTransportFactoryBrowserTest.TestLostContext
in a sticky way on the XP and Vista waterfall bots. Win7 still likes you.
Problems started at builders:
http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%281%29/builds/28514
http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%28dbg%29%282%29/builds/33745
http://build.chromium.org/p/chromium.win/builders/Vista%20Tests%20%281%29/builds/41163
Reverting & monitoring to narrow down the problem space.
> Enable GPU control lists in tests.
>
> Reland of https://codereview.chromium.org/23534006/ (see that and the bug for more details).
>
> Also adding INFO-level logging to spell out each control list rule being applied on the bots (makes debugging and understanding failures much easier).
>
> R=piman@chromium.org
> TBR=jcivelli, piman, zmo
> BUG=295799
>
> Previously Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=224810
> Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=224845
>
> Previously Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=227977
> Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=228014
>
> Review URL: https://codereview.chromium.org/23703017
TBR=gab@chromium.org
Review URL: https://codereview.chromium.org/27138003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/config/gpu_control_list.h')
| -rw-r--r-- | gpu/config/gpu_control_list.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/gpu/config/gpu_control_list.h b/gpu/config/gpu_control_list.h index 29a5f77..ced3b52 100644 --- a/gpu/config/gpu_control_list.h +++ b/gpu/config/gpu_control_list.h @@ -93,13 +93,6 @@ class GPU_EXPORT GpuControlList { // Register whether "all" is recognized as all features. void set_supports_feature_type_all(bool supported); - // Enables logging of control list decisions. - void enable_control_list_logging( - const std::string& control_list_logging_name) { - control_list_logging_enabled_ = true; - control_list_logging_name_ = control_list_logging_name; - } - private: friend class GpuControlListEntryTest; friend class MachineModelInfoTest; @@ -296,11 +289,6 @@ class GPU_EXPORT GpuControlList { const FeatureMap& feature_map, bool supports_feature_type_all); - // Logs a control list match for this rule in the list identified by - // |control_list_logging_name|. - void LogControlListMatch( - const std::string& control_list_logging_name) const; - // Determines if a given os/gc/machine_model/driver is included in the // Entry set. bool Contains(OsType os_type, const std::string& os_version, @@ -491,9 +479,6 @@ class GPU_EXPORT GpuControlList { // The features a GpuControlList recognizes and handles. FeatureMap feature_map_; bool supports_feature_type_all_; - - bool control_list_logging_enabled_; - std::string control_list_logging_name_; }; } // namespace gpu |