Supports FontList in Textfield.

ui/base/resource/resource_bundle.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_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 
 #include "build/build_config.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/platform_file.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "ui/base/layout.h"
 #include "ui/base/ui_export.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/native_widget_types.h"
 
 class SkBitmap;
 
 namespace base {
 class Lock;
 class RefCountedStaticMemory;
 }
 
@@ skipping 66 matching lines @@
     // Retrieve a raw data resource. Return true if a resource was provided or
     // false to attempt retrieval of the default resource.
     virtual bool GetRawDataResource(int resource_id,
                                     ScaleFactor scale_factor,
                                     base::StringPiece* value) = 0;
 
     // Retrieve a localized string. Return true if a string was provided or
     // false to attempt retrieval of the default string.
     virtual bool GetLocalizedString(int message_id, string16* value) = 0;
 
-    // Return a font resource or NULL to attempt retrieval of the default
+    // Returns a font list or NULL to attempt retrieval of the default
     // resource.
-    virtual scoped_ptr<gfx::Font> GetFont(FontStyle style) = 0;
+    virtual scoped_ptr<gfx::FontList> GetFontList(FontStyle style) = 0;

[tony, 2013/07/31 17:23:48]

I would leave the delegate unchanged since we don't use it within Chromium.  It
exists for CEF.  I'll let them change this API if they want or need to.

[Yuki, 2013/08/01 07:49:30]

Thanks for the advice.  I've changed the code to keep Delegate::GetFont
supported as is, but I've added GetFontList in addition to GetFont, which is
convenient for ResourceBundle::LoadFontsIfNecessary.

[Yuki, 2013/08/01 13:50:01]

I found that ResourceBundle is not exported by UI_EXPORT and it cannot have non
pure virtual member functions.  As you suggested, I keep the Delegate class
unchanged.  I've introduced a helper function GetFontListFromDelegate instead.

 
    protected:
     virtual ~Delegate() {}
   };
 
   // Initialize the ResourceBundle for this process. Does not take ownership of
   // the |delegate| value. Returns the language selected.
   // NOTE: Mac ignores this and always loads up resources for the language
   // defined by the Cocoa UI (i.e., NSBundle does the language work).
   //
@@ skipping 103 matching lines @@
   // nearest the scale factor |scale_factor|.
   // Use ResourceHandle::SCALE_FACTOR_NONE for scale independent image resources
   // (such as wallpaper).
   base::StringPiece GetRawDataResourceForScale(int resource_id,
                                                ScaleFactor scale_factor) const;
 
   // Get a localized string given a message id.  Returns an empty
   // string if the message_id is not found.
   string16 GetLocalizedString(int message_id);
 
+  // Returns the font list for the specified style.
+  const gfx::FontList& GetFontList(FontStyle style);
+
   // Returns the font for the specified style.
   const gfx::Font& GetFont(FontStyle style);
 
   // Resets and reloads the cached fonts.  This is useful when the fonts of the
   // system have changed, for example, when the locale has changed.
   void ReloadFonts();
 
   // Overrides the path to the pak file from which the locale resources will be
   // loaded. Pass an empty path to undo.
   void OverrideLocalePakForTest(const base::FilePath& pak_path);
@@ skipping 117 matching lines @@
   // The maximum scale factor currently loaded.
   ScaleFactor max_scale_factor_;
 
   // Cached images. The ResourceBundle caches all retrieved images and keeps
   // ownership of the pointers.
   typedef std::map<int, gfx::Image> ImageMap;
   ImageMap images_;
 
   gfx::Image empty_image_;
 
-  // The various fonts used. Cached to avoid repeated GDI creation/destruction.
-  scoped_ptr<gfx::Font> base_font_;
-  scoped_ptr<gfx::Font> bold_font_;
-  scoped_ptr<gfx::Font> small_font_;
-  scoped_ptr<gfx::Font> small_bold_font_;
-  scoped_ptr<gfx::Font> medium_font_;
-  scoped_ptr<gfx::Font> medium_bold_font_;
-  scoped_ptr<gfx::Font> large_font_;
-  scoped_ptr<gfx::Font> large_bold_font_;
-  scoped_ptr<gfx::Font> web_font_;
+  // The various font lists used. Cached to avoid repeated GDI
+  // creation/destruction.
+  scoped_ptr<gfx::FontList> base_font_list_;
+  scoped_ptr<gfx::FontList> bold_font_list_;
+  scoped_ptr<gfx::FontList> small_font_list_;
+  scoped_ptr<gfx::FontList> small_bold_font_list_;
+  scoped_ptr<gfx::FontList> medium_font_list_;
+  scoped_ptr<gfx::FontList> medium_bold_font_list_;
+  scoped_ptr<gfx::FontList> large_font_list_;
+  scoped_ptr<gfx::FontList> large_bold_font_list_;
+  scoped_ptr<gfx::FontList> web_font_list_;
 
   base::FilePath overridden_pak_path_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
 };
 
 }  // namespace ui
 
 // TODO(beng): Someday, maybe, get rid of this.
 using ui::ResourceBundle;
 
 #endif  // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_