Supports FontList::DeriveFontListWithSizeDeltaAndStyle, etc.

ui/gfx/font_list.h

Index: ui/gfx/font_list.h
diff --git a/ui/gfx/font_list.h b/ui/gfx/font_list.h
index 8c1d0f30bc5fe8934e1474157ac007a337381177..f7c71ac28a8b9f4e62b7c969c77c1b1e3d3a74fe 100644
--- a/ui/gfx/font_list.h
+++ b/ui/gfx/font_list.h
@@ -41,6 +41,11 @@ class UI_EXPORT FontList {
   // size.
   explicit FontList(const std::string& font_description_string);
 
+  // Creates a font list from font names, styles and size.
+  FontList(const std::vector<std::string>& font_names,
+           int font_style,
+           int font_size);
+
   // Creates a font list from a Font vector.
   // All fonts in this vector should have the same style and size.
   explicit FontList(const std::vector<Font>& fonts);
@@ -57,6 +62,17 @@ class UI_EXPORT FontList {
   // given font |size| in pixels.
   FontList DeriveFontListWithSize(int size) const;
 
+  // Returns a new FontList with the same font names and style but with resized.

[msw, 2013/08/06 05:10:14]

nit: s/but with resized/but resized/ (same on line 69)

[Yuki, 2013/08/07 14:34:03]

Done.

+  // |size_delta| is the size in pixels to add to the current font size.
+  FontList DeriveFontListWithSizeDelta(int size_delta) const;
+
+  // Returns a new FontList with the same font names but with resized and
+  // with the given style.  |size_delta| is the size in pixels to add to the
+  // current font size.  |font_style| specifies the new style, which is a
+  // bitmask of the values: Font::BOLD, Font::ITALIC and Font::UNDERLINE.
+  FontList DeriveFontListWithSizeDeltaAndStyle(int size_delta,
+                                               int font_style) const;
+
   // Returns the height of this font list, which is max(ascent) + max(descent)
   // for all the fonts in the font list.
   int GetHeight() const;
@@ -65,6 +81,18 @@ class UI_EXPORT FontList {
   // fonts in the font list.
   int GetBaseline() const;
 
+  // Returns the average character width for the font list.
+  int GetAverageCharacterWidth() const;
+
+  // Returns the number of horizontal pixels needed to display the specified

[msw, 2013/08/06 05:10:14]

nit: s/the specified string/|text|/

[Yuki, 2013/08/07 14:34:03]

Done.

+  // string.
+  int GetStringWidth(const base::string16& text) const;
+
+  // Returns the expected number of horizontal pixels needed to display the
+  // specified length of characters. Call GetStringWidth() to retrieve the
+  // actual number.
+  int GetExpectedTextWidth(int length) const;

[msw, 2013/08/06 05:10:14]

Is this necessary? It doesn't seem to be used in your followup CL:
https://codereview.chromium.org/2173600

[Yuki, 2013/08/07 14:34:03]

As we discussed, I removed GetAverageCharacterWidth() instead.

+
   // Returns the |gfx::Font::FontStyle| style flags for this font list.
   int GetFontStyle() const;
 
@@ -99,6 +127,10 @@ class UI_EXPORT FontList {
   // The cached common height and baseline of the fonts in the font list.
   mutable int common_height_;
   mutable int common_baseline_;
+
+  // Cached font style and size.
+  mutable int font_style_;
+  mutable int font_size_;
 };
 
 }  // namespace gfx