Renames gfx::FontList::Derive* family.

ui/gfx/font_list.cc

 // Copyright (c) 2012 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_list.h"
 
 #include <algorithm>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 155 matching lines @@
 void FontList::SetDefaultFontDescription(const std::string& font_description) {
   // The description string must end with "px" for size in pixel, or must be
   // the empty string, which specifies to use a single default font.
   DCHECK(font_description.empty() ||
          EndsWith(font_description, "px", true));
 
   g_default_font_description.Get() = font_description;
   g_default_font_list = NULL;
 }
 
-FontList FontList::DeriveFontList(int font_style) const {
-  return DeriveFontListWithSizeDeltaAndStyle(0, font_style);
-}
-
-FontList FontList::DeriveFontListWithSize(int size) const {
-  DCHECK_GT(size, 0);
-  return DeriveFontListWithSizeDeltaAndStyle(size - GetFontSize(),
-                                             GetFontStyle());
-}
-
-FontList FontList::DeriveFontListWithSizeDelta(int size_delta) const {
-  return DeriveFontListWithSizeDeltaAndStyle(size_delta, GetFontStyle());
-}
-
-FontList FontList::DeriveFontListWithSizeDeltaAndStyle(int size_delta,
-                                                       int style) const {
+FontList FontList::Derive(int size_delta, int font_style) const {
   // If there is a font vector, derive from that.
   if (!fonts_.empty()) {
     std::vector<Font> fonts = fonts_;
     for (size_t i = 0; i < fonts.size(); ++i)
-      fonts[i] = fonts[i].DeriveFont(size_delta, style);
+      fonts[i] = fonts[i].DeriveFont(size_delta, font_style);
     return FontList(fonts);
   }
 
   // Otherwise, parse the font description string to derive from it.
   std::vector<std::string> font_names;
   int old_size;
   int old_style;
   ParseFontDescriptionString(font_description_string_, &font_names,
                              &old_style, &old_size);
-  int size = old_size + size_delta;
-  DCHECK_GT(size, 0);
-  return FontList(font_names, style, size);
+  const int size = std::max(1, old_size + size_delta);
+  return FontList(font_names, font_style, size);
+}
+
+FontList FontList::DeriveWithSizeDelta(int size_delta) const {
+  return Derive(size_delta, GetFontStyle());
+}
+
+FontList FontList::DeriveFontListWithSizeDelta(int size_delta) const {

[Alexei Svitkine (slow), 2014/01/20 15:38:10]

Remove this one since it's equivalent to DeriveWithSizeDelta().

[Yuki, 2014/01/20 16:43:24]

Will do after I rewrite all calls to this method.

+  return Derive(size_delta, GetFontStyle());
+}
+
+FontList FontList::DeriveFontListWithSizeDeltaAndStyle(int size_delta,
+                                                       int font_style) const {
+  return Derive(size_delta, font_style);
 }
 
 int FontList::GetHeight() const {
   if (common_height_ == -1)
     CacheCommonFontHeightAndBaseline();
   return common_height_;
 }
 
 int FontList::GetBaseline() const {
   if (common_baseline_ == -1)
     CacheCommonFontHeightAndBaseline();
   return common_baseline_;
 }
 
 int FontList::GetCapHeight() const {
   // Assume the primary font is used to render Latin characters.
   return GetPrimaryFont().GetCapHeight();
 }
 
-int FontList::GetStringWidth(const base::string16& text) const {
-  // Rely on the primary font metrics for the time being.
-  // TODO(yukishiino): Not only the first font, all the fonts in the list should
-  // be taken into account to compute the pixels needed to display |text|.
-  // Also this method, including one in Font class, should be deprecated and
-  // client code should call Canvas::GetStringWidth(text, font_list) directly.
-  // Our plan is as follows:
-  //   1. Introduce the FontList version of Canvas::GetStringWidth().
-  //   2. Make client code call Canvas::GetStringWidth().
-  //   3. Retire {Font,FontList}::GetStringWidth().
-  return GetPrimaryFont().GetStringWidth(text);
-}
-
 int FontList::GetExpectedTextWidth(int length) const {
   // Rely on the primary font metrics for the time being.
   return GetPrimaryFont().GetExpectedTextWidth(length);
 }
 
 int FontList::GetFontStyle() const {
   if (font_style_ == -1)
     CacheFontStyleAndSize();
   return font_style_;
 }
@@ skipping 68 matching lines @@
     font_style_ = fonts_[0].GetStyle();
     font_size_ = fonts_[0].GetFontSize();
   } else {
     std::vector<std::string> font_names;
     ParseFontDescriptionString(font_description_string_, &font_names,
                                &font_style_, &font_size_);
   }
 }
 
 }  // namespace gfx