Supports FontList::DeriveFontListWithSizeDeltaAndStyle, etc.

ui/gfx/font_list.h

 // 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.
 
 #ifndef UI_GFX_FONT_LIST_H_
 #define UI_GFX_FONT_LIST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 23 matching lines @@
 // and operator= is used in RenderText::SetFontList().
 class UI_EXPORT FontList {
  public:
   // Creates a font list with a Font with default name and style.
   FontList();
 
   // Creates a font list from a string representing font names, styles, and
   // 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);
 
   // Creates a font list from a Font.
   explicit FontList(const Font& font);
 
   ~FontList();
 
   // Returns a new FontList with the given |font_style| flags.
   FontList DeriveFontList(int font_style) const;
 
   // Returns a new FontList with the same font names and style but with the
   // 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;
 
   // Returns the baseline of this font list, which is max(baseline) for all the
   // 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;
 
   // Returns a string representing font names, styles, and size. If the FontList
   // is initialized by a vector of Font, use the first font's style and size
   // for the description.
   const std::string& GetFontDescriptionString() const;
 
   // Returns the font size in pixels.
   int GetFontSize() const;
@@ skipping 14 matching lines @@
   // Please refer to the comments before class declaration for details on string
   // format.
   // If FontList is constructed with a vector of font,
   // |font_description_string_| is not initialized during construction. Instead,
   // it is computed lazily when user asked to get the font description string.
   mutable std::string font_description_string_;
 
   // 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
 
 #endif  // UI_GFX_FONT_LIST_H_