Start removing enum ui::ResourceBundle::FontStyle, fix MacViews font sizes

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 <stddef.h>
 
 #include <map>
@@ skipping 25 matching lines @@
 
 namespace ui {
 
 class DataPack;
 class ResourceHandle;
 
 // ResourceBundle is a central facility to load images and other resources,
 // such as theme graphics. Every resource is loaded only once.
 class UI_BASE_EXPORT ResourceBundle {
  public:
-  // An enumeration of the various font styles used throughout Chrome.
-  // The following holds true for the font sizes:
-  // Small <= SmallBold <= Base <= Bold <= Medium <= MediumBold <= Large.
+  // Legacy font size deltas. Consider these to be magic numbers. New code
+  // should declare their own size delta constant using an identifier that
+  // imparts some semantic meaning.
+  static const int kSmallFontDelta = -1;
+  static const int kMediumFontDelta = 3;
+  static const int kLargeFontDelta = 8;
+
+  // Legacy font style mappings. TODO(tapted): Phase these out in favour of
+  // client code providing their own constant with the desired font size delta.
   enum FontStyle {
-    // NOTE: depending upon the locale, using one of the *BoldFont below
-    // may *not* actually result in a bold font.
     SmallFont,
     SmallBoldFont,
     BaseFont,
     BoldFont,
     MediumFont,
     MediumBoldFont,
     LargeFont,
     LargeBoldFont,
   };
 
@@ skipping 169 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.
   base::string16 GetLocalizedString(int message_id);
 
-  // Returns the font list for the specified style.
+  // Returns a font list derived from the platform-specific "Base" font list.
+  // The result is always cached and exists for the lifetime of the process.
+  const gfx::FontList& GetFontListWithDelta(
+      int size_delta,
+      gfx::Font::FontStyle style = gfx::Font::NORMAL);
+
+  // Returns the primary font from the FontList given by GetFontListWithDelta().
+  const gfx::Font& GetFontWithDelta(
+      int size_delta,
+      gfx::Font::FontStyle style = gfx::Font::NORMAL);
+
+  // Deprecated. Returns fonts using hard-coded size deltas implied by |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 79 matching lines @@
   void LoadTestResources(const base::FilePath& path,
                          const base::FilePath& locale_path);
 
   // Unload the locale specific strings and prepares to load new ones. See
   // comments for ReloadLocaleResources().
   void UnloadLocaleResources();
 
   // Initializes the font description of default gfx::FontList.
   void InitDefaultFontList();
 
-  // Initializes all the gfx::FontList members if they haven't yet been
-  // initialized.
-  void LoadFontsIfNecessary();
-
   // Fills the |bitmap| given the data file to look in and the |resource_id|.
   // Returns false if the resource does not exist.
   //
   // If the call succeeds, |fell_back_to_1x| indicates whether Chrome's custom
   // csCl PNG chunk is present (added by GRIT if it falls back to a 100% image).
   bool LoadBitmap(const ResourceHandle& data_handle,
                   int resource_id,
                   SkBitmap* bitmap,
                   bool* fell_back_to_1x) const;
 
@@ skipping 46 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 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_;
+  // The various font lists used, as a map from a signed size delta from the
+  // platform base font size, plus style, to the FontList. Cached to avoid
+  // repeated GDI creation/destruction and font derivation.
+  // Must be accessed only while holding |images_and_fonts_lock_|.
+  std::map<std::pair<int, gfx::Font::FontStyle>, gfx::FontList> font_cache_;
 
   base::FilePath overridden_pak_path_;
 
   IdToStringMap overridden_locale_strings_;
 
   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_