Relax software rendering list parsing.

content/browser/gpu/gpu_blacklist_unittest.cc

 // 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.
 
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 39 matching lines @@
                .Append(FILE_PATH_LITERAL("software_rendering_list.json"));
   ASSERT_TRUE(file_util::PathExists(data_file));
   int64 data_file_size64 = 0;
   ASSERT_TRUE(file_util::GetFileSize(data_file, &data_file_size64));
   int data_file_size = static_cast<int>(data_file_size64);
   scoped_array<char> data(new char[data_file_size]);
   ASSERT_EQ(file_util::ReadFile(data_file, data.get(), data_file_size),
             data_file_size);
   std::string json_string(data.get(), data_file_size);
   GpuBlacklist blacklist("1.0");
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(json_string, true));
+  EXPECT_TRUE(blacklist.LoadGpuBlacklist(json_string, GpuBlacklist::kAllOs));
+  EXPECT_FALSE(blacklist.contains_unknown_fields());
 }
 
-TEST_F(GpuBlacklistTest, DeafaultBlacklistSettings) {
+TEST_F(GpuBlacklistTest, DefaultBlacklistSettings) {
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
   GpuBlacklist blacklist("1.0");
   // Default blacklist settings: all feature are allowed.
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
 }
 
 TEST_F(GpuBlacklistTest, EmptyBlacklist) {
   // Empty list: all features are allowed.
   const std::string empty_list_json =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"2.5\",\n"
       "  \"entries\": [\n"
       "  ]\n"
       "}";
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
   GpuBlacklist blacklist("1.0");
 
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(empty_list_json, false));
+  EXPECT_TRUE(
+      blacklist.LoadGpuBlacklist(empty_list_json, GpuBlacklist::kAllOs));
   uint16 major, minor;
   EXPECT_TRUE(blacklist.GetVersion(&major, &minor));
   EXPECT_EQ(major, 2u);
   EXPECT_EQ(minor, 5u);
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
 }
 
 TEST_F(GpuBlacklistTest, DetailedEntryAndInvalidJson) {
@@ skipping 20 matching lines @@
       "      },\n"
       "      \"blacklist\": [\n"
       "        \"accelerated_compositing\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
   GpuBlacklist blacklist("1.0");
 
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(exact_list_json, false));
+  EXPECT_TRUE(
+      blacklist.LoadGpuBlacklist(exact_list_json, GpuBlacklist::kAllOs));
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(
       flags.flags(),
       static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAcceleratedCompositing));
 
   // Invalid json input should not change the current blacklist settings.
   const std::string invalid_json = "invalid";
 
-  EXPECT_FALSE(blacklist.LoadGpuBlacklist(invalid_json, false));
+  EXPECT_FALSE(blacklist.LoadGpuBlacklist(invalid_json, GpuBlacklist::kAllOs));
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(
       flags.flags(),
       static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAcceleratedCompositing));
   std::vector<uint32> entries;
   blacklist.GetGpuFeatureFlagEntries(
       GpuFeatureFlags::kGpuFeatureAcceleratedCompositing, entries);
   EXPECT_EQ(entries.size(), 1u);
   EXPECT_EQ(entries[0], 5u);
@@ skipping 17 matching lines @@
       "      \"blacklist\": [\n"
       "        \"webgl\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
   GpuBlacklist blacklist("1.0");
 
   // Blacklist entries won't be filtered to the current OS only upon loading.
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(vendor_json, false));
+  EXPECT_TRUE(blacklist.LoadGpuBlacklist(vendor_json, GpuBlacklist::kAllOs));
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(),
             static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsWin, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(),
             static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(),
             static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
   // Blacklist entries will be filtered to the current OS only upon loading.
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(vendor_json, true));
+  EXPECT_TRUE(
+      blacklist.LoadGpuBlacklist(vendor_json, GpuBlacklist::kCurrentOsOnly));
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(),
             static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsWin, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(),
             static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
@@ skipping 17 matching lines @@
       "      \"vendor_id\": \"0x10de\",\n"
       "      \"blacklist\": [\n"
       "        \"accelerated_2d_canvas\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
   GpuBlacklist blacklist("1.0");
 
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(vendor_linux_json, false));
+  EXPECT_TRUE(
+      blacklist.LoadGpuBlacklist(vendor_linux_json, GpuBlacklist::kAllOs));
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsWin, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
   EXPECT_EQ(
       flags.flags(),
@@ skipping 19 matching lines @@
       "      ],\n"
       "      \"blacklist\": [\n"
       "        \"accelerated_2d_canvas\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
   GpuBlacklist blacklist("1.0");
 
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(linux_except_nvidia_json, false));
+  EXPECT_TRUE(blacklist.LoadGpuBlacklist(linux_except_nvidia_json,
+      GpuBlacklist::kAllOs));
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsWin, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
 }
@@ skipping 17 matching lines @@
       "      ],\n"
       "      \"blacklist\": [\n"
       "        \"accelerated_2d_canvas\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
   GpuBlacklist blacklist("1.0");
 
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(linux_except_intel_json, false));
+  EXPECT_TRUE(blacklist.LoadGpuBlacklist(linux_except_intel_json,
+      GpuBlacklist::kAllOs));
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsWin, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
   EXPECT_EQ(
       flags.flags(),
@@ skipping 18 matching lines @@
       "      },\n"
       "      \"blacklist\": [\n"
       "        \"accelerated_2d_canvas\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
   GpuBlacklist blacklist("1.0");
 
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(date_windows_json, false));
+  EXPECT_TRUE(
+      blacklist.LoadGpuBlacklist(date_windows_json, GpuBlacklist::kAllOs));
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsWin, os_version.get(), gpu_info());
   EXPECT_EQ(
       flags.flags(),
@@ skipping 12 matching lines @@
       "      \"device_id\": [\"0x1023\", \"0x0640\"],\n"
       "      \"blacklist\": [\n"
       "        \"multisampling\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
   GpuBlacklist blacklist("1.0");
 
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(devices_json, false));
+  EXPECT_TRUE(blacklist.LoadGpuBlacklist(devices_json, GpuBlacklist::kAllOs));
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(),
             static_cast<uint32>(GpuFeatureFlags::kGpuFeatureMultisampling));
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsWin, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(),
             static_cast<uint32>(GpuFeatureFlags::kGpuFeatureMultisampling));
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
@@ skipping 14 matching lines @@
       "      },\n"
       "      \"blacklist\": [\n"
       "        \"webgl\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
   GpuBlacklist blacklist("1.0");
 
-  EXPECT_TRUE(blacklist.LoadGpuBlacklist(devices_json, false));
+  EXPECT_TRUE(blacklist.LoadGpuBlacklist(devices_json, GpuBlacklist::kAllOs));
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsChromeOS, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(),
             static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
 }
 
 TEST_F(GpuBlacklistTest, ChromeVersionEntry) {
@@ skipping 10 matching lines @@
       "      },\n"
       "      \"blacklist\": [\n"
       "        \"webgl\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
 
   GpuBlacklist blacklist9("9.0");
-  EXPECT_TRUE(blacklist9.LoadGpuBlacklist(browser_version_json, false));
+  EXPECT_TRUE(
+      blacklist9.LoadGpuBlacklist(browser_version_json, GpuBlacklist::kAllOs));
   GpuFeatureFlags flags = blacklist9.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsWin, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(), 0u);
 
   GpuBlacklist blacklist10("10.0");
-  EXPECT_TRUE(blacklist10.LoadGpuBlacklist(browser_version_json, false));
+  EXPECT_TRUE(
+      blacklist10.LoadGpuBlacklist(browser_version_json, GpuBlacklist::kAllOs));
   flags = blacklist10.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsWin, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(),
             static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
 }
 
 TEST_F(GpuBlacklistTest, MalformedVendor) {
   // vendor_id is defined as list instead of string.
   const std::string malformed_vendor_json =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"0.1\",\n"
       "  \"entries\": [\n"
       "    {\n"
       "      \"id\": 1,\n"
       "      \"vendor_id\": \"[0x10de]\",\n"
       "      \"blacklist\": [\n"
       "        \"accelerated_2d_canvas\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   GpuBlacklist blacklist("1.0");
 
-  EXPECT_FALSE(blacklist.LoadGpuBlacklist(malformed_vendor_json, false));
+  EXPECT_FALSE(
+      blacklist.LoadGpuBlacklist(malformed_vendor_json, GpuBlacklist::kAllOs));
 }
 
+TEST_F(GpuBlacklistTest, UnknownField) {
+  const std::string unknown_field_json =
+      "{\n"
+      "  \"name\": \"gpu blacklist\",\n"
+      "  \"version\": \"0.1\",\n"
+      "  \"entries\": [\n"
+      "    {\n"
+      "      \"id\": 1,\n"
+      "      \"unknown_field\": 0,\n"
+      "      \"blacklist\": [\n"
+      "        \"accelerated_2d_canvas\"\n"
+      "      ]\n"
+      "    },\n"
+      "    {\n"
+      "      \"id\": 2,\n"
+      "      \"blacklist\": [\n"
+      "        \"accelerated_2d_canvas\"\n"
+      "      ]\n"
+      "    }\n"
+      "  ]\n"
+      "}";
+  GpuBlacklist blacklist("1.0");
+
+  EXPECT_TRUE(
+      blacklist.LoadGpuBlacklist(unknown_field_json, GpuBlacklist::kAllOs));
+  EXPECT_EQ(1u, blacklist.num_entries());
+  EXPECT_TRUE(blacklist.contains_unknown_fields());

[vangelis, 2011/08/24 19:00:17]

It would be useful in these tests to blacklist different features (e.g. WebGL
and canvas) in different entries to make sure that the entry skipping logic is
correct.

[Zhenyao Mo, 2011/08/24 22:29:57]

Done.

+}
+
+TEST_F(GpuBlacklistTest, UnknownExceptionField) {
+  const std::string unknown_exception_field_json =
+      "{\n"
+      "  \"name\": \"gpu blacklist\",\n"
+      "  \"version\": \"0.1\",\n"
+      "  \"entries\": [\n"
+      "    {\n"
+      "      \"id\": 1,\n"
+      "      \"unknown_field\": 0,\n"
+      "      \"blacklist\": [\n"
+      "        \"accelerated_2d_canvas\"\n"
+      "      ]\n"
+      "    },\n"
+      "    {\n"
+      "      \"id\": 2,\n"
+      "      \"exceptions\": [\n"
+      "        {\n"
+      "          \"unknown_field\": 0\n"
+      "        }\n"
+      "      ],\n"
+      "      \"blacklist\": [\n"
+      "        \"accelerated_2d_canvas\"\n"
+      "      ]\n"
+      "    },\n"
+      "    {\n"
+      "      \"id\": 3,\n"
+      "      \"blacklist\": [\n"
+      "        \"accelerated_2d_canvas\"\n"
+      "      ]\n"
+      "    }\n"
+      "  ]\n"
+      "}";
+  GpuBlacklist blacklist("1.0");
+
+  EXPECT_TRUE(blacklist.LoadGpuBlacklist(unknown_exception_field_json,
+      GpuBlacklist::kAllOs));
+  EXPECT_EQ(2u, blacklist.num_entries());
+  EXPECT_TRUE(blacklist.contains_unknown_fields());
+}
+
+TEST_F(GpuBlacklistTest, UnknownFeature) {
+  const std::string unknown_feature_json =
+      "{\n"
+      "  \"name\": \"gpu blacklist\",\n"
+      "  \"version\": \"0.1\",\n"
+      "  \"entries\": [\n"
+      "    {\n"
+      "      \"id\": 1,\n"
+      "      \"blacklist\": [\n"
+      "        \"accelerated_something\"\n"
+      "      ]\n"
+      "    },\n"
+      "    {\n"
+      "      \"id\": 2,\n"
+      "      \"blacklist\": [\n"
+      "        \"accelerated_2d_canvas\"\n"
+      "      ]\n"
+      "    }\n"
+      "  ]\n"
+      "}";
+  GpuBlacklist blacklist("1.0");
+
+  EXPECT_TRUE(
+      blacklist.LoadGpuBlacklist(unknown_feature_json, GpuBlacklist::kAllOs));
+  EXPECT_EQ(1u, blacklist.num_entries());
+  EXPECT_TRUE(blacklist.contains_unknown_fields());
+}
+