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 21 matching lines @@
     kOsUnknown
   };
 
   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.
+  // tolerate_errors==true indicates ignore entries that cause processing
+  // errors but keep the rest - this is important for backward compatibility
+  // when new fields are added; tolerate_errors==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);
+                        bool current_os_only,
+                        bool tolerate_errors);
   bool LoadGpuBlacklist(const base::DictionaryValue& parsed_json,
-                        bool current_os_only);
+                        bool current_os_only,
+                        bool tolerate_errors);
 
   // 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 189 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_