Revert 130299 - Revert 130298 - Revert 130258 - Make it possible to blacklist gpu's based on the Wi…

content/browser/gpu/gpu_blacklist.h

Index: content/browser/gpu/gpu_blacklist.h
===================================================================
--- content/browser/gpu/gpu_blacklist.h	(revision 131377)
+++ content/browser/gpu/gpu_blacklist.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -110,17 +110,6 @@
     kMalformed
   };
 
-  enum NumericOp {
-    kBetween,  // <= * <=
-    kEQ,  // =
-    kLT,  // <
-    kLE,  // <=
-    kGT,  // >
-    kGE,  // >=
-    kAny,
-    kUnknown  // Indicates the data is invalid.
-  };
-
   class VersionInfo {
    public:
     VersionInfo(const std::string& version_op,
@@ -135,7 +124,21 @@
     bool IsValid() const;
 
    private:
-    NumericOp op_;
+    enum Op {
+      kBetween,  // <= * <=
+      kEQ,  // =
+      kLT,  // <
+      kLE,  // <=
+      kGT,  // >
+      kGE,  // >=
+      kAny,
+      kUnknown  // Indicates VersionInfo data is invalid.
+    };
+
+    // Maps string to Op; returns kUnknown if it's not a valid Op.
+    static Op StringToOp(const std::string& version_op);
+
+    Op op_;
     scoped_ptr<Version> version_;
     scoped_ptr<Version> version2_;
   };
@@ -190,24 +193,6 @@
     std::string value_;
   };
 
-  class FloatInfo {
-   public:
-    FloatInfo(const std::string& float_op,
-              const std::string& float_value,
-              const std::string& float_value2);
-
-    // Determines if a given float is included in the FloatInfo.
-    bool Contains(float value) const;
-
-    // Determines if the FloatInfo contains valid information.
-    bool IsValid() const;
-
-   private:
-    NumericOp op_;
-    float value_;
-    float value2_;
-  };
-
   class GpuBlacklistEntry;
   typedef scoped_refptr<GpuBlacklistEntry> ScopedGpuBlacklistEntry;
 
@@ -287,18 +272,6 @@
     bool SetGLRendererInfo(const std::string& renderer_op,
                            const std::string& renderer_value);
 
-    bool SetPerfGraphicsInfo(const std::string& op,
-                             const std::string& float_string,
-                             const std::string& float_string2);
-
-    bool SetPerfGamingInfo(const std::string& op,
-                           const std::string& float_string,
-                           const std::string& float_string2);
-
-    bool SetPerfOverallInfo(const std::string& op,
-                            const std::string& float_string,
-                            const std::string& float_string2);
-
     bool SetBlacklistedFeatures(
         const std::vector<std::string>& blacklisted_features);
 
@@ -317,9 +290,6 @@
     scoped_ptr<VersionInfo> driver_date_info_;
     scoped_ptr<StringInfo> gl_vendor_info_;
     scoped_ptr<StringInfo> gl_renderer_info_;
-    scoped_ptr<FloatInfo> perf_graphics_info_;
-    scoped_ptr<FloatInfo> perf_gaming_info_;
-    scoped_ptr<FloatInfo> perf_overall_info_;
     scoped_ptr<GpuFeatureFlags> feature_flags_;
     std::vector<ScopedGpuBlacklistEntry> exceptions_;
     bool contains_unknown_fields_;
@@ -345,8 +315,6 @@
 
   void SetBrowserVersion(const std::string& version_string);
 
-  static NumericOp StringToNumericOp(const std::string& op);
-
   scoped_ptr<Version> version_;
   std::vector<ScopedGpuBlacklistEntry> blacklist_;