Updates subpixel positioning and hinting when DSF is changed

ui/gfx/font_render_params_linux_unittest.cc

Index: ui/gfx/font_render_params_linux_unittest.cc
diff --git a/ui/gfx/font_render_params_linux_unittest.cc b/ui/gfx/font_render_params_linux_unittest.cc
index 46a4fcfaac27f036693448205271b265cc92db1e..8c86f75574ed620e70e8cfbe9896a34bf2850fd4 100644
--- a/ui/gfx/font_render_params_linux_unittest.cc
+++ b/ui/gfx/font_render_params_linux_unittest.cc
@@ -107,8 +107,8 @@ TEST_F(FontRenderParamsTest, Default) {
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
-  FontRenderParams params = GetFontRenderParams(
-      FontRenderParamsQuery(true), NULL);
+  FontRenderParams params =
+      GetCurrentFontRenderParams(FontRenderParamsQuery(true), NULL);
   EXPECT_TRUE(params.antialiasing);
   EXPECT_TRUE(params.autohinter);
   EXPECT_TRUE(params.use_bitmaps);
@@ -143,14 +143,14 @@ TEST_F(FontRenderParamsTest, Size) {
   // second or third blocks.
   FontRenderParamsQuery query(false);
   query.pixel_size = 12;
-  FontRenderParams params = GetFontRenderParams(query, NULL);
+  FontRenderParams params = GetCurrentFontRenderParams(query, NULL);
   EXPECT_TRUE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
             params.subpixel_rendering);
 
   query.pixel_size = 10;
-  params = GetFontRenderParams(query, NULL);
+  params = GetCurrentFontRenderParams(query, NULL);
   EXPECT_FALSE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
@@ -158,7 +158,7 @@ TEST_F(FontRenderParamsTest, Size) {
 
   query.pixel_size = 0;
   query.point_size = 20;
-  params = GetFontRenderParams(query, NULL);
+  params = GetCurrentFontRenderParams(query, NULL);
   EXPECT_TRUE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_SLIGHT, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_RGB,
@@ -189,25 +189,25 @@ TEST_F(FontRenderParamsTest, Style) {
 
   FontRenderParamsQuery query(false);
   query.style = Font::NORMAL;
-  FontRenderParams params = GetFontRenderParams(query, NULL);
+  FontRenderParams params = GetCurrentFontRenderParams(query, NULL);
   EXPECT_EQ(FontRenderParams::HINTING_SLIGHT, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_RGB,
             params.subpixel_rendering);
 
   query.style = Font::BOLD;
-  params = GetFontRenderParams(query, NULL);
+  params = GetCurrentFontRenderParams(query, NULL);
   EXPECT_EQ(FontRenderParams::HINTING_SLIGHT, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
             params.subpixel_rendering);
 
   query.style = Font::ITALIC;
-  params = GetFontRenderParams(query, NULL);
+  params = GetCurrentFontRenderParams(query, NULL);
   EXPECT_EQ(FontRenderParams::HINTING_NONE, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_RGB,
             params.subpixel_rendering);
 
   query.style = Font::BOLD | Font::ITALIC;
-  params = GetFontRenderParams(query, NULL);
+  params = GetCurrentFontRenderParams(query, NULL);
   EXPECT_EQ(FontRenderParams::HINTING_NONE, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
             params.subpixel_rendering);
@@ -227,8 +227,8 @@ TEST_F(FontRenderParamsTest, Scalable) {
       kFontconfigFileFooter));
 
   // Check that we specifically ask how scalable fonts should be rendered.
-  FontRenderParams params = GetFontRenderParams(
-      FontRenderParamsQuery(false), NULL);
+  FontRenderParams params =
+      GetCurrentFontRenderParams(FontRenderParamsQuery(false), NULL);
   EXPECT_TRUE(params.antialiasing);
 }
 
@@ -247,11 +247,11 @@ TEST_F(FontRenderParamsTest, UseBitmaps) {
       kFontconfigFileFooter));
 
   FontRenderParamsQuery query(false);
-  FontRenderParams params = GetFontRenderParams(query, NULL);
+  FontRenderParams params = GetCurrentFontRenderParams(query, NULL);
   EXPECT_FALSE(params.use_bitmaps);
 
   query.pixel_size = 5;
-  params = GetFontRenderParams(query, NULL);
+  params = GetCurrentFontRenderParams(query, NULL);
   EXPECT_TRUE(params.use_bitmaps);
 }
 
@@ -268,10 +268,11 @@ TEST_F(FontRenderParamsTest, ForceFullHintingWhenAntialiasingIsDisabled) {
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
-  // Full hinting should be forced. See the comment in GetFontRenderParams() for
+  // Full hinting should be forced. See the comment in
+  // GetCurrentFontRenderParams() for
   // more information.
-  FontRenderParams params = GetFontRenderParams(
-      FontRenderParamsQuery(false), NULL);
+  FontRenderParams params =
+      GetCurrentFontRenderParams(FontRenderParamsQuery(false), NULL);
   EXPECT_FALSE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
@@ -279,28 +280,6 @@ TEST_F(FontRenderParamsTest, ForceFullHintingWhenAntialiasingIsDisabled) {
   EXPECT_FALSE(params.subpixel_positioning);
 }
 
-#if defined(OS_CHROMEOS)
-TEST_F(FontRenderParamsTest, ForceSubpixelPositioning) {
-  {
-    FontRenderParams params =
-        GetFontRenderParams(FontRenderParamsQuery(false), NULL);
-    EXPECT_TRUE(params.antialiasing);
-    EXPECT_FALSE(params.subpixel_positioning);
-    SetFontRenderParamsDeviceScaleFactor(1.0f);
-  }
-  ClearFontRenderParamsCacheForTest();
-  SetFontRenderParamsDeviceScaleFactor(1.25f);
-  // Subpixel positioning should be forced.
-  {
-    FontRenderParams params =
-        GetFontRenderParams(FontRenderParamsQuery(false), NULL);
-    EXPECT_TRUE(params.antialiasing);
-    EXPECT_TRUE(params.subpixel_positioning);
-    SetFontRenderParamsDeviceScaleFactor(1.0f);
-  }
-}
-#endif
-
 TEST_F(FontRenderParamsTest, OnlySetConfiguredValues) {
   // Configure the LinuxFontDelegate (which queries GtkSettings on desktop
   // Linux) to request subpixel rendering.
@@ -318,8 +297,8 @@ TEST_F(FontRenderParamsTest, OnlySetConfiguredValues) {
       kFontconfigFileFooter));
 
   // The subpixel rendering setting from the delegate should make it through.
-  FontRenderParams params = GetFontRenderParams(
-      FontRenderParamsQuery(false), NULL);
+  FontRenderParams params =
+      GetCurrentFontRenderParams(FontRenderParamsQuery(false), NULL);
   EXPECT_EQ(system_params.subpixel_rendering, params.subpixel_rendering);
 }
 
@@ -336,7 +315,8 @@ TEST_F(FontRenderParamsTest, NoFontconfigMatch) {
   query.families.push_back("Times New Roman");
   query.pixel_size = 10;
   std::string suggested_family;
-  FontRenderParams params = GetFontRenderParams(query, &suggested_family);
+  FontRenderParams params =
+      GetCurrentFontRenderParams(query, &suggested_family);
 
   // The system params and the first requested family should be returned.
   EXPECT_EQ(system_params.antialiasing, params.antialiasing);
@@ -355,7 +335,7 @@ TEST_F(FontRenderParamsTest, MissingFamily) {
   query.families.push_back("Arial");
   query.families.push_back("Verdana");
   std::string suggested_family;
-  GetFontRenderParams(query, &suggested_family);
+  GetCurrentFontRenderParams(query, &suggested_family);
   EXPECT_EQ("Arial", suggested_family);
 }
 
@@ -375,13 +355,13 @@ TEST_F(FontRenderParamsTest, SubstituteFamily) {
   FontRenderParamsQuery query(false);
   query.families.push_back("Helvetica");
   std::string suggested_family;
-  GetFontRenderParams(query, &suggested_family);
+  GetCurrentFontRenderParams(query, &suggested_family);
   EXPECT_EQ("Verdana", suggested_family);
 
   query.families.clear();
   query.families.push_back("Arial");
   suggested_family.clear();
-  GetFontRenderParams(query, &suggested_family);
+  GetCurrentFontRenderParams(query, &suggested_family);
   EXPECT_EQ("Verdana", suggested_family);
 }