Add FontRenderParamsQuery.

ui/gfx/font_render_params_linux_unittest.cc

 // Copyright 2014 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 "ui/gfx/font_render_params.h"
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 80 matching lines @@
       std::string(kFontconfigFileHeader) +
       kFontconfigMatchHeader +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       CreateFontconfigEditStanza("autohint", "bool", "false") +
       CreateFontconfigEditStanza("hinting", "bool", "true") +
       CreateFontconfigEditStanza("hintstyle", "const", "hintfull") +
       CreateFontconfigEditStanza("rgba", "const", "rgb") +
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
-  FontRenderParams params = GetDefaultFontRenderParams();
+  FontRenderParams params = GetFontRenderParams(
+      FontRenderParamsQuery(true), NULL);
   EXPECT_TRUE(params.antialiasing);
   EXPECT_FALSE(params.autohinter);
   EXPECT_TRUE(params.use_bitmaps);
   EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
   EXPECT_FALSE(params.subpixel_positioning);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_RGB,
             params.subpixel_rendering);
 }
 
 TEST_F(FontRenderParamsTest, Size) {
@@ skipping 12 matching lines @@
       kFontconfigMatchFooter +
       kFontconfigMatchHeader +
       CreateFontconfigTestStanza("size", "more_eq", "double", "20") +
       CreateFontconfigEditStanza("hintstyle", "const", "hintslight") +
       CreateFontconfigEditStanza("rgba", "const", "rgb") +
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
   // The defaults should be used when the supplied size isn't matched by the
   // second or third blocks.
-  int pixel_size = 12;
-  FontRenderParams params = GetCustomFontRenderParams(
-      false, NULL, &pixel_size, NULL, NULL, NULL);
+  FontRenderParamsQuery query(false);
+  query.pixel_size = 12;
+  FontRenderParams params = GetFontRenderParams(query, NULL);
   EXPECT_TRUE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
             params.subpixel_rendering);
 
-  pixel_size = 10;
-  params = GetCustomFontRenderParams(
-      false, NULL, &pixel_size, NULL, NULL, NULL);
+  query.pixel_size = 10;
+  params = GetFontRenderParams(query, NULL);
   EXPECT_FALSE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
             params.subpixel_rendering);
 
-  int point_size = 20;
-  params = GetCustomFontRenderParams(
-      false, NULL, NULL, &point_size, NULL, NULL);
+  query.pixel_size = 0;
+  query.point_size = 20;
+  params = GetFontRenderParams(query, NULL);
   EXPECT_TRUE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_SLIGHT, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_RGB,
             params.subpixel_rendering);
 }
 
 TEST_F(FontRenderParamsTest, Style) {
   ASSERT_TRUE(LoadSystemFont("arial.ttf"));
   // Load a config that disables antialiasing for bold text and disables
   // hinting for italic text.
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
       kFontconfigMatchHeader +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       CreateFontconfigEditStanza("hinting", "bool", "true") +
       CreateFontconfigEditStanza("hintstyle", "const", "hintfull") +
       kFontconfigMatchFooter +
       kFontconfigMatchHeader +
       CreateFontconfigTestStanza("weight", "eq", "const", "bold") +
       CreateFontconfigEditStanza("antialias", "bool", "false") +
       kFontconfigMatchFooter +
       kFontconfigMatchHeader +
       CreateFontconfigTestStanza("slant", "eq", "const", "italic") +
       CreateFontconfigEditStanza("hinting", "bool", "false") +
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
-  int style = Font::NORMAL;
-  FontRenderParams params = GetCustomFontRenderParams(
-      false, NULL, NULL, NULL, &style, NULL);
+  FontRenderParamsQuery query(false);
+  query.style = Font::NORMAL;
+  FontRenderParams params = GetFontRenderParams(query, NULL);
   EXPECT_TRUE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
 
-  style = Font::BOLD;
-  params = GetCustomFontRenderParams(
-      false, NULL, NULL, NULL, &style, NULL);
+  query.style = Font::BOLD;
+  params = GetFontRenderParams(query, NULL);
   EXPECT_FALSE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
 
-  style = Font::ITALIC;
-  params = GetCustomFontRenderParams(
-      false, NULL, NULL, NULL, &style, NULL);
+  query.style = Font::ITALIC;
+  params = GetFontRenderParams(query, NULL);
   EXPECT_TRUE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_NONE, params.hinting);
 
-  style = Font::BOLD | Font::ITALIC;
-  params = GetCustomFontRenderParams(
-      false, NULL, NULL, NULL, &style, NULL);
+  query.style = Font::BOLD | Font::ITALIC;
+  params = GetFontRenderParams(query, NULL);
   EXPECT_FALSE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_NONE, params.hinting);
 }
 
 TEST_F(FontRenderParamsTest, Scalable) {
   ASSERT_TRUE(LoadSystemFont("arial.ttf"));
   // Load a config that only enables antialiasing for scalable fonts.
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
       kFontconfigMatchHeader +
       CreateFontconfigEditStanza("antialias", "bool", "false") +
       kFontconfigMatchFooter +
       kFontconfigMatchHeader +
       CreateFontconfigTestStanza("scalable", "eq", "bool", "true") +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
   // Check that we specifically ask how scalable fonts should be rendered.
-  FontRenderParams params = GetCustomFontRenderParams(
-      false, NULL, NULL, NULL, NULL, NULL);
+  FontRenderParams params = GetFontRenderParams(
+      FontRenderParamsQuery(false), NULL);
   EXPECT_TRUE(params.antialiasing);
 }
 
 TEST_F(FontRenderParamsTest, UseBitmaps) {
   ASSERT_TRUE(LoadSystemFont("arial.ttf"));
   // Load a config that enables embedded bitmaps for fonts <= 10 pixels.
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
       kFontconfigMatchHeader +
       CreateFontconfigEditStanza("embeddedbitmap", "bool", "false") +
       kFontconfigMatchFooter +
       kFontconfigMatchHeader +
       CreateFontconfigTestStanza("pixelsize", "less_eq", "double", "10") +
       CreateFontconfigEditStanza("embeddedbitmap", "bool", "true") +
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
-  FontRenderParams params = GetCustomFontRenderParams(
-      false, NULL, NULL, NULL, NULL, NULL);
+  FontRenderParamsQuery query(false);
+  FontRenderParams params = GetFontRenderParams(query, NULL);
   EXPECT_FALSE(params.use_bitmaps);
 
-  const int pixel_size = 5;
-  params = GetCustomFontRenderParams(
-      false, NULL, &pixel_size, NULL, NULL, NULL);
+  query.pixel_size = 5;
+  params = GetFontRenderParams(query, NULL);
   EXPECT_TRUE(params.use_bitmaps);
 }
 
 TEST_F(FontRenderParamsTest, OnlySetConfiguredValues) {
   // Configure the LinuxFontDelegate (which queries GtkSettings on desktop
   // Linux) to request subpixel rendering.
   FontRenderParams system_params;
   system_params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_RGB;
   test_font_delegate_.set_params(system_params);
 
   // Load a Fontconfig config that enables antialiasing but doesn't say anything
   // about subpixel rendering.
   ASSERT_TRUE(LoadSystemFont("arial.ttf"));
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
       kFontconfigMatchHeader +
       CreateFontconfigEditStanza("antialias", "bool", "true") +
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
   // The subpixel rendering setting from the delegate should make it through.
-  FontRenderParams params = GetCustomFontRenderParams(
-      false, NULL, NULL, NULL, NULL, NULL);
+  FontRenderParams params = GetFontRenderParams(
+      FontRenderParamsQuery(false), NULL);
   EXPECT_EQ(system_params.subpixel_rendering, params.subpixel_rendering);
 }
 
 TEST_F(FontRenderParamsTest, NoFontconfigMatch) {
   // Don't load a Fontconfig configuration.
   FontRenderParams system_params;
   system_params.antialiasing = true;
   system_params.hinting = FontRenderParams::HINTING_MEDIUM;
   system_params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_RGB;
   test_font_delegate_.set_params(system_params);
 
-  std::vector<std::string> families;
-  families.push_back("Arial");
-  families.push_back("Times New Roman");
-  const int pixel_size = 10;
+  FontRenderParamsQuery query(false);
+  query.families.push_back("Arial");
+  query.families.push_back("Times New Roman");
+  query.pixel_size = 10;
   std::string suggested_family;
-  FontRenderParams params = GetCustomFontRenderParams(
-      false, &families, &pixel_size, NULL, NULL, &suggested_family);
+  FontRenderParams params = GetFontRenderParams(query, &suggested_family);

[msw, 2014/07/23 22:16:35]

nit: I just noticed that this is the only test that attempts to get the
suggested family via |family_out|, and it's a test where we don't get a match
and fall back to the first family of the list supplied in the query. Perhaps add
a test that gets the |family_out| with a matching config? (later is ok)

[Daniel Erat, 2014/07/23 22:47:18]

sure, was planning to do this to check that we're actually using the font that
fontconfig instructs us to

 
   // The system params and the first requested family should be returned.
   EXPECT_EQ(system_params.antialiasing, params.antialiasing);
   EXPECT_EQ(system_params.hinting, params.hinting);
   EXPECT_EQ(system_params.subpixel_rendering, params.subpixel_rendering);
-  EXPECT_EQ("Arial", suggested_family);
+  EXPECT_EQ(query.families[0], suggested_family);
 }
 
 }  // namespace gfx