Relax software rendering list parsing.

content/browser/gpu/gpu_blacklist.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_BLACKLIST_H_
 #define CONTENT_BROWSER_GPU_GPU_BLACKLIST_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 14 matching lines @@
  public:
   enum OsType {
     kOsLinux,
     kOsMacosx,
     kOsWin,
     kOsChromeOS,
     kOsAny,
     kOsUnknown
   };
 
+  enum OsFilter {
+    // In loading, Ignore all entries that belong to other OS.
+    kCurrentOsOnly,
+    // In loading, keep all entries. This is for testing only.
+    kAllOs
+  };
+
+  enum UnknownFieldOption {
+    // Ignore any entries with unknown field.
+    kIgnoreEntryWithUnknownField,
+    // The same as kIgnoreEntryWithUnknownField; however, if an exception entry
+    // contains an unknown field, ignore that exception entry but still keep
+    // the main entry.
+    kIgnoreExceptionWithUnknownField,
+    // Ignore all entries if an unknown field exists. This is for testing only.
+    kFailOnUnknownField
+  };
+
   explicit GpuBlacklist(const std::string& browser_version_string);
   ~GpuBlacklist();
 
   // Loads blacklist information from a json file.
-  // current_os_only==true indicates all blacklist entries that don't belong to
-  // the current OS are discarded; current_os_only==false should only be used
-  // for testing purpose.
   // If failed, the current GpuBlacklist is un-touched.
   bool LoadGpuBlacklist(const std::string& json_context,
-                        bool current_os_only);
+                        OsFilter os_filter,
+                        UnknownFieldOption unknown_field_option);
   bool LoadGpuBlacklist(const base::DictionaryValue& parsed_json,
-                        bool current_os_only);
+                        OsFilter os_filter,
+                        UnknownFieldOption unknown_field_option);
 
   // Collects system information and combines them with gpu_info and blacklist
   // information to determine gpu feature flags.
   // If os is kOsAny, use the current OS; if os_version is null, use the
   // current OS version.
   GpuFeatureFlags DetermineGpuFeatureFlags(OsType os,
                                            Version* os_version,
                                            const GPUInfo& gpu_info);
 
   // Collects the entries that set the "feature" flag from the last
   // DetermineGpuFeatureFlags() call.  This tells which entries are responsible
   // for raising a certain flag, i.e, for blacklisting a certain feature.
   // Examples of "feature":
   //   kGpuFeatureAll - any of the supported features;
   //   kGpuFeatureWebgl - a single feature;
   //   kGpuFeatureWebgl | kGpuFeatureAcceleratedCompositing - two features.
   void GetGpuFeatureFlagEntries(GpuFeatureFlags::GpuFeatureType feature,
                                 std::vector<uint32>& entry_ids) const;
 
-
   // Returns status information on the blacklist. This is two parted:
   // {
   //    featureStatus: []
   //    problems: []
   // }
   //
   // Each entry in feature_status has:
   // {
   //    name:  "name of feature"
   //    status: "enabled" | "unavailable_software" | "unavailable_off" |
@@ skipping 12 matching lines @@
   //    "description": "Your GPU is too old",
   //    "crBugs": [1234],
   //    "webkitBugs": []
   // }
   base::Value* GetFeatureStatus(bool gpu_access_allowed,
                                 bool disable_accelerated_compositing,
                                 bool disable_accelerated_2D_canvas,
                                 bool disable_experimental_webgl,
                                 bool disable_multisampling) const;
 
+  // Returns the number of entries.
+  size_t num_entries() const;
+
   // Return the largest entry id.  This is used for histogramming.
   uint32 max_entry_id() const;
 
   // Collects the version of the current blacklist.  Returns false and sets
   // major and minor to 0 on failure.
   bool GetVersion(uint16* major, uint16* monir) const;
 
   // Collects the version of the current blacklist from a parsed json file.
   // Returns false and sets major and minor to 0 on failure.
   static bool GetVersion(
@@ skipping 97 matching lines @@
 
     // Returns the OsType.
     OsType GetOsType() const;
 
     // Returns the entry's unique id.  0 is reserved.
     uint32 id() const;
 
     // Returns the description of the entry
     const std::string& description() const { return description_; }
 
-    // Returs a list of Chromium and Webkit bugs applicable to this entry
+    // Returns a list of Chromium and Webkit bugs applicable to this entry
     const std::vector<int>& cr_bugs() const { return cr_bugs_; }
     const std::vector<int>& webkit_bugs() const { return webkit_bugs_; }
 
     // Returns the GpuFeatureFlags.
     GpuFeatureFlags GetGpuFeatureFlags() const;
 
+    bool contains_unknown_field() const {
+      return contains_unknown_field_;
+    }
+
+    bool contains_exception_with_unknown_field() const {
+      return contains_exception_with_unknown_field_;
+    }
+
     ~GpuBlacklistEntry();
 
    private:
     GpuBlacklistEntry();
 
     bool SetId(uint32 id);
 
     bool SetOsInfo(const std::string& os,
                    const std::string& version_op,
                    const std::string& version_string,
@@ skipping 28 matching lines @@
     std::vector<int> webkit_bugs_;
     scoped_ptr<OsInfo> os_info_;
     uint32 vendor_id_;
     std::vector<uint32> device_id_list_;
     scoped_ptr<StringInfo> driver_vendor_info_;
     scoped_ptr<VersionInfo> driver_version_info_;
     scoped_ptr<VersionInfo> driver_date_info_;
     scoped_ptr<StringInfo> gl_renderer_info_;
     scoped_ptr<GpuFeatureFlags> feature_flags_;
     std::vector<GpuBlacklistEntry*> exceptions_;
+    bool contains_unknown_field_;
+    bool contains_exception_with_unknown_field_;
   };
 
   enum BrowserVersionSupport {
     kSupported,
     kUnsupported,
     kMalformed
   };
 
   // Gets the current OS type.
   static OsType GetOsType();
@@ skipping 17 matching lines @@
   // user machine.  It is updated everytime DetermineGpuFeatureFlags() is
   // called and is used later by GetGpuFeatureFlagEntries().
   std::vector<GpuBlacklistEntry*> active_entries_;
 
   uint32 max_entry_id_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuBlacklist);
 };
 
 #endif  // CONTENT_BROWSER_GPU_GPU_BLACKLIST_H_