Renames gfx::FontList::Derive* family.

ui/base/resource/resource_bundle.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/base/resource/resource_bundle.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 620 matching lines @@
       medium_bold_font_list_ = GetFontListFromDelegate(MediumBoldFont);
       large_font_list_ = GetFontListFromDelegate(LargeFont);
       large_bold_font_list_ = GetFontListFromDelegate(LargeBoldFont);
     }
 
     if (!base_font_list_.get())
       base_font_list_.reset(new gfx::FontList());
 
     if (!bold_font_list_.get()) {
       bold_font_list_.reset(new gfx::FontList());
-      *bold_font_list_ = base_font_list_->DeriveFontList(
+      *bold_font_list_ = base_font_list_->DeriveWithStyle(
           base_font_list_->GetFontStyle() | gfx::Font::BOLD);
     }
 
     if (!small_font_list_.get()) {
       small_font_list_.reset(new gfx::FontList());
-      *small_font_list_ = base_font_list_->DeriveFontListWithSize(
-          base_font_list_->GetFontSize() + kSmallFontSizeDelta);
+      *small_font_list_ =
+          base_font_list_->DeriveWithSizeDelta(kSmallFontSizeDelta);
     }
 
     if (!small_bold_font_list_.get()) {
       small_bold_font_list_.reset(new gfx::FontList());
-      *small_bold_font_list_ = small_font_list_->DeriveFontList(
+      *small_bold_font_list_ = small_font_list_->DeriveWithStyle(
           small_font_list_->GetFontStyle() | gfx::Font::BOLD);
     }
 
     if (!medium_font_list_.get()) {
       medium_font_list_.reset(new gfx::FontList());
-      *medium_font_list_ = base_font_list_->DeriveFontListWithSize(
-          base_font_list_->GetFontSize() + kMediumFontSizeDelta);
+      *medium_font_list_ =
+          base_font_list_->DeriveWithSizeDelta(kMediumFontSizeDelta);
     }
 
     if (!medium_bold_font_list_.get()) {
       medium_bold_font_list_.reset(new gfx::FontList());
-      *medium_bold_font_list_ = medium_font_list_->DeriveFontList(
+      *medium_bold_font_list_ = medium_font_list_->DeriveWithStyle(
           medium_font_list_->GetFontStyle() | gfx::Font::BOLD);
     }
 
     if (!large_font_list_.get()) {
       large_font_list_.reset(new gfx::FontList());
-      *large_font_list_ = base_font_list_->DeriveFontListWithSize(
-          base_font_list_->GetFontSize() + kLargeFontSizeDelta);
+      *large_font_list_ =
+          base_font_list_->DeriveWithSizeDelta(kLargeFontSizeDelta);
     }
 
     if (!large_bold_font_list_.get()) {
       large_bold_font_list_.reset(new gfx::FontList());
-      *large_bold_font_list_ = large_font_list_->DeriveFontList(
+      *large_bold_font_list_ = large_font_list_->DeriveWithStyle(
           large_font_list_->GetFontStyle() | gfx::Font::BOLD);
     }
   }
 }
 
 scoped_ptr<gfx::FontList> ResourceBundle::GetFontListFromDelegate(
     FontStyle style) {
   DCHECK(delegate_);
   scoped_ptr<gfx::Font> font = delegate_->GetFont(style);
   if (font.get())
@@ skipping 110 matching lines @@
 // static
 bool ResourceBundle::DecodePNG(const unsigned char* buf,
                                size_t size,
                                SkBitmap* bitmap,
                                bool* fell_back_to_1x) {
   *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
 }  // namespace ui