Remove obsolete for_web_contents parameter in FontRenderParamsQuery.

BUG=143619

Review URL: https://codereview.chromium.org/1063603003

Cr-Commit-Position: refs/heads/master@{#323920}

13 files changed, 31 insertions, 38 deletions

diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
index fb5488f..c0674f5 100644
--- a/android_webview/native/aw_settings.cc
+++ b/android_webview/native/aw_settings.cc
@@ -36,7 +36,7 @@ void PopulateFixedRendererPreferences(RendererPreferences* prefs) {
 
   // TODO(boliu): Deduplicate with chrome/ code.
   CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params,
-      (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(true), NULL)));
+      (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), NULL)));
   prefs->should_antialias_text = params.antialiasing;
   prefs->use_subpixel_positioning = params.subpixel_positioning;
   prefs->hinting = params.hinting;
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index fe240c6..4fc4057 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -1526,13 +1526,13 @@ class FontTestHelper : public test::AshTestBase {
 
 bool IsTextSubpixelPositioningEnabled() {
   gfx::FontRenderParams params =
-      gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(false), NULL);
+      gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), NULL);
   return params.subpixel_positioning;
 }
 
 gfx::FontRenderParams::Hinting GetFontHintingParams() {
   gfx::FontRenderParams params =
-      gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(false), NULL);
+      gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), NULL);
   return params.hinting;
 }
 
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index ce174ef..3760640 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -108,7 +108,7 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
 
 #if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN)
   CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params,
-      (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(true), NULL)));
+      (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), NULL)));
   prefs->should_antialias_text = params.antialiasing;
   prefs->use_subpixel_positioning = params.subpixel_positioning;
   prefs->hinting = params.hinting;
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
index 5e16ba7..2f7f2cd 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
@@ -1375,7 +1375,7 @@ void Gtk2UI::ClearAllThemeData() {
 void Gtk2UI::UpdateDefaultFont(const PangoFontDescription* desc) {
   // Use gfx::FontRenderParams to select a family and determine the rendering
   // settings.
-  gfx::FontRenderParamsQuery query(false /* for_web_contents */);
+  gfx::FontRenderParamsQuery query;
   base::SplitString(pango_font_description_get_family(desc), ',',
                     &query.families);
 
diff --git a/content/browser/renderer_host/sandbox_ipc_linux.cc b/content/browser/renderer_host/sandbox_ipc_linux.cc
index 1437321..bc24bca 100644
--- a/content/browser/renderer_host/sandbox_ipc_linux.cc
+++ b/content/browser/renderer_host/sandbox_ipc_linux.cc
@@ -297,7 +297,7 @@ void SandboxIPCHandler::HandleGetStyleForStrike(
 
   EnsureWebKitInitialized();
 
-  gfx::FontRenderParamsQuery query(true);
+  gfx::FontRenderParamsQuery query;
   query.families.push_back(family);
   query.pixel_size = pixel_size;
   query.style = gfx::Font::NORMAL |
diff --git a/ui/gfx/font_render_params.cc b/ui/gfx/font_render_params.cc
index 44c6bcf..a434379 100644
--- a/ui/gfx/font_render_params.cc
+++ b/ui/gfx/font_render_params.cc
@@ -54,9 +54,8 @@ FontRenderParams::SubpixelRenderingToSkiaLCDOrientation(
   return SkFontHost::kHorizontal_LCDOrientation;
 }
 
-FontRenderParamsQuery::FontRenderParamsQuery(bool for_web_contents)
-    : for_web_contents(for_web_contents),
-      pixel_size(0),
+FontRenderParamsQuery::FontRenderParamsQuery()
+    : pixel_size(0),
       point_size(0),
       style(-1),
       device_scale_factor(0) {
diff --git a/ui/gfx/font_render_params.h b/ui/gfx/font_render_params.h
index 0bf10d4..ed4e593 100644
--- a/ui/gfx/font_render_params.h
+++ b/ui/gfx/font_render_params.h
@@ -67,18 +67,13 @@ struct GFX_EXPORT FontRenderParams {
 
 // A query used to determine the appropriate FontRenderParams.
 struct GFX_EXPORT FontRenderParamsQuery {
-  explicit FontRenderParamsQuery(bool for_web_contents);
+  FontRenderParamsQuery();
   ~FontRenderParamsQuery();
 
   bool is_empty() const {
     return families.empty() && pixel_size <= 0 && point_size <= 0 && style < 0;
   }
 
-  // True if rendering text for the web.
-  // TODO(derat): Remove this once FontRenderParams::subpixel_positioning is
-  // gone: http://crbug.com/396659
-  bool for_web_contents;
-
   // Requested font families, or empty if unset.
   std::vector<std::string> families;
 
diff --git a/ui/gfx/font_render_params_linux.cc b/ui/gfx/font_render_params_linux.cc
index 9f9440a..f09f703 100644
--- a/ui/gfx/font_render_params_linux.cc
+++ b/ui/gfx/font_render_params_linux.cc
@@ -191,9 +191,8 @@ bool QueryFontconfig(const FontRenderParamsQuery& query,
 // cache key.
 uint32 HashFontRenderParamsQuery(const FontRenderParamsQuery& query) {
   return base::Hash(base::StringPrintf(
-      "%d|%d|%d|%d|%s|%f", query.for_web_contents, query.pixel_size,
-      query.point_size, query.style, JoinString(query.families, ',').c_str(),
-      query.device_scale_factor));
+      "%d|%d|%d|%s|%f", query.pixel_size, query.point_size, query.style,
+      JoinString(query.families, ',').c_str(), query.device_scale_factor));
 }
 
 }  // namespace
diff --git a/ui/gfx/font_render_params_linux_unittest.cc b/ui/gfx/font_render_params_linux_unittest.cc
index 211de98..42c665c 100644
--- a/ui/gfx/font_render_params_linux_unittest.cc
+++ b/ui/gfx/font_render_params_linux_unittest.cc
@@ -107,7 +107,7 @@ TEST_F(FontRenderParamsTest, Default) {
       kFontconfigFileFooter));
 
   FontRenderParams params = GetFontRenderParams(
-      FontRenderParamsQuery(true), NULL);
+      FontRenderParamsQuery(), NULL);
   EXPECT_TRUE(params.antialiasing);
   EXPECT_TRUE(params.autohinter);
   EXPECT_TRUE(params.use_bitmaps);
@@ -140,7 +140,7 @@ TEST_F(FontRenderParamsTest, Size) {
 
   // The defaults should be used when the supplied size isn't matched by the
   // second or third blocks.
-  FontRenderParamsQuery query(false);
+  FontRenderParamsQuery query;
   query.pixel_size = 12;
   FontRenderParams params = GetFontRenderParams(query, NULL);
   EXPECT_TRUE(params.antialiasing);
@@ -186,7 +186,7 @@ TEST_F(FontRenderParamsTest, Style) {
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
-  FontRenderParamsQuery query(false);
+  FontRenderParamsQuery query;
   query.style = Font::NORMAL;
   FontRenderParams params = GetFontRenderParams(query, NULL);
   EXPECT_EQ(FontRenderParams::HINTING_SLIGHT, params.hinting);
@@ -227,7 +227,7 @@ TEST_F(FontRenderParamsTest, Scalable) {
 
   // Check that we specifically ask how scalable fonts should be rendered.
   FontRenderParams params = GetFontRenderParams(
-      FontRenderParamsQuery(false), NULL);
+      FontRenderParamsQuery(), NULL);
   EXPECT_TRUE(params.antialiasing);
 }
 
@@ -245,7 +245,7 @@ TEST_F(FontRenderParamsTest, UseBitmaps) {
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
-  FontRenderParamsQuery query(false);
+  FontRenderParamsQuery query;
   FontRenderParams params = GetFontRenderParams(query, NULL);
   EXPECT_FALSE(params.use_bitmaps);
 
@@ -270,7 +270,7 @@ TEST_F(FontRenderParamsTest, ForceFullHintingWhenAntialiasingIsDisabled) {
   // Full hinting should be forced. See the comment in GetFontRenderParams() for
   // more information.
   FontRenderParams params = GetFontRenderParams(
-      FontRenderParamsQuery(false), NULL);
+      FontRenderParamsQuery(), NULL);
   EXPECT_FALSE(params.antialiasing);
   EXPECT_EQ(FontRenderParams::HINTING_FULL, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
@@ -282,7 +282,7 @@ TEST_F(FontRenderParamsTest, ForceFullHintingWhenAntialiasingIsDisabled) {
 TEST_F(FontRenderParamsTest, ForceSubpixelPositioning) {
   {
     FontRenderParams params =
-        GetFontRenderParams(FontRenderParamsQuery(false), NULL);
+        GetFontRenderParams(FontRenderParamsQuery(), NULL);
     EXPECT_TRUE(params.antialiasing);
     EXPECT_FALSE(params.subpixel_positioning);
     SetFontRenderParamsDeviceScaleFactor(1.0f);
@@ -292,7 +292,7 @@ TEST_F(FontRenderParamsTest, ForceSubpixelPositioning) {
   // Subpixel positioning should be forced.
   {
     FontRenderParams params =
-        GetFontRenderParams(FontRenderParamsQuery(false), NULL);
+        GetFontRenderParams(FontRenderParamsQuery(), NULL);
     EXPECT_TRUE(params.antialiasing);
     EXPECT_TRUE(params.subpixel_positioning);
     SetFontRenderParamsDeviceScaleFactor(1.0f);
@@ -318,7 +318,7 @@ TEST_F(FontRenderParamsTest, OnlySetConfiguredValues) {
 
   // The subpixel rendering setting from the delegate should make it through.
   FontRenderParams params = GetFontRenderParams(
-      FontRenderParamsQuery(false), NULL);
+      FontRenderParamsQuery(), NULL);
   EXPECT_EQ(system_params.subpixel_rendering, params.subpixel_rendering);
 }
 
@@ -330,7 +330,7 @@ TEST_F(FontRenderParamsTest, NoFontconfigMatch) {
   system_params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_RGB;
   test_font_delegate_.set_params(system_params);
 
-  FontRenderParamsQuery query(false);
+  FontRenderParamsQuery query;
   query.families.push_back("Arial");
   query.families.push_back("Times New Roman");
   query.pixel_size = 10;
@@ -349,7 +349,7 @@ TEST_F(FontRenderParamsTest, MissingFamily) {
   // Verdana and check that Arial is returned.
   ASSERT_TRUE(LoadSystemFontIntoFontconfig("arial.ttf"));
   ASSERT_TRUE(LoadSystemFontIntoFontconfig("verdana.ttf"));
-  FontRenderParamsQuery query(false);
+  FontRenderParamsQuery query;
   query.families.push_back("Helvetica");
   query.families.push_back("Arial");
   query.families.push_back("Verdana");
@@ -371,7 +371,7 @@ TEST_F(FontRenderParamsTest, SubstituteFamily) {
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
-  FontRenderParamsQuery query(false);
+  FontRenderParamsQuery query;
   query.families.push_back("Helvetica");
   std::string suggested_family;
   GetFontRenderParams(query, &suggested_family);
diff --git a/ui/gfx/platform_font_linux.cc b/ui/gfx/platform_font_linux.cc
index 2f1bbf1..9aeaaa0 100644
--- a/ui/gfx/platform_font_linux.cc
+++ b/ui/gfx/platform_font_linux.cc
@@ -79,7 +79,7 @@ PlatformFontLinux::PlatformFontLinux() {
     // On Chrome OS, a FontList font description string is stored as a
     // translatable resource and passed in via SetDefaultFontDescription().
     if (default_font_description_) {
-      FontRenderParamsQuery query(false /* for_web_contents */);
+      FontRenderParamsQuery query;
       CHECK(FontList::ParseDescription(*default_font_description_,
                                        &query.families, &query.style,
                                        &query.pixel_size))
@@ -107,7 +107,7 @@ PlatformFontLinux::PlatformFontLinux() {
 
 PlatformFontLinux::PlatformFontLinux(const std::string& font_name,
                                      int font_size_pixels) {
-  FontRenderParamsQuery query(false);
+  FontRenderParamsQuery query;
   query.families.push_back(font_name);
   query.pixel_size = font_size_pixels;
   query.style = Font::NORMAL;
@@ -143,7 +143,7 @@ Font PlatformFontLinux::DeriveFont(int size_delta, int style) const {
   skia::RefPtr<SkTypeface> typeface =
       (style == style_) ? typeface_ : CreateSkTypeface(style, &new_family);
 
-  FontRenderParamsQuery query(false);
+  FontRenderParamsQuery query;
   query.families.push_back(new_family);
   query.pixel_size = new_size;
   query.style = style;
@@ -190,7 +190,7 @@ const FontRenderParams& PlatformFontLinux::GetFontRenderParams() {
 #if defined(OS_CHROMEOS)
   float current_scale_factor = GetFontRenderParamsDeviceScaleFactor();
   if (current_scale_factor != device_scale_factor_) {
-    FontRenderParamsQuery query(false);
+    FontRenderParamsQuery query;
     query.families.push_back(font_family_);
     query.pixel_size = font_size_pixels_;
     query.style = style_;
diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
index 8874553..73f59f6 100644
--- a/ui/gfx/platform_font_mac.mm
+++ b/ui/gfx/platform_font_mac.mm
@@ -170,7 +170,7 @@ void PlatformFontMac::CalculateMetricsAndInitRenderParams() {
   average_width_ =
       NSWidth([font boundingRectForGlyph:[font glyphWithName:@"x"]]);
 
-  FontRenderParamsQuery query(false);
+  FontRenderParamsQuery query;
   query.families.push_back(font_name_);
   query.pixel_size = font_size_;
   query.style = font_style_;
diff --git a/ui/gfx/platform_font_win.cc b/ui/gfx/platform_font_win.cc
index 7d63a71..7296481 100644
--- a/ui/gfx/platform_font_win.cc
+++ b/ui/gfx/platform_font_win.cc
@@ -322,7 +322,7 @@ int PlatformFontWin::GetFontSize() const {
 
 const FontRenderParams& PlatformFontWin::GetFontRenderParams() {
   CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params,
-      (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(false), NULL)));
+      (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), NULL)));
   return params;
 }
 
@@ -489,7 +489,7 @@ PlatformFontWin::HFontRef* PlatformFontWin::CreateHFontRefFromSkia(
                               static_cast<SkTypeface::Style>(skia_style)));
 
   gfx::FontRenderParams font_params =
-      gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(false), nullptr);
+      gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr);
   SkFontHost::SetSubpixelOrder(
       gfx::FontRenderParams::SubpixelRenderingToSkiaLCDOrder(
           font_params.subpixel_rendering));
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc
index c7b070f..23767c1 100644
--- a/ui/gfx/render_text_harfbuzz.cc
+++ b/ui/gfx/render_text_harfbuzz.cc
@@ -1364,7 +1364,7 @@ void RenderTextHarfBuzz::ShapeRun(const base::string16& text,
 
     fallback_fonts.insert(family);
 
-    FontRenderParamsQuery query(false);
+    FontRenderParamsQuery query;
     query.families.push_back(family);
     query.pixel_size = run->font_size;
     query.style = run->font_style;