Renames gfx::FontList::Derive* family.

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 48 matching lines @@
   // Sets the description string for default FontList construction. If it's
   // empty, FontList will initialize using the default Font constructor.
   //
   // The client code must call this function before any call of the default
   // constructor. This should be done on the UI thread.
   //
   // ui::ResourceBundle may call this function more than once when UI language
   // is changed.
   static void SetDefaultFontDescription(const std::string& font_description);
 
-  // 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 resized.
-  // |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 resized and 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 Derive(int size_delta, int font_style) const;
+
+  // Returns a new FontList with the same font names and style but resized.
+  // |size_delta| is the size in pixels to add to the current font size.
+  FontList DeriveWithSizeDelta(int size_delta) const;
+
+  // Obsolete versions.  Use the abolve methods instead.
+  FontList DeriveFontListWithSizeDelta(int size_delta) const;
   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 cap height of this font list.
   // Currently returns the cap height of the primary font.
   int GetCapHeight() const;
 
-  // Returns the number of horizontal pixels needed to display |text|.
-  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;
 
   // 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
@@ skipping 35 matching lines @@
   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_