Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(642)

Unified Diff: ui/base/resource/resource_bundle.h

Issue 1819753003: Allow various font weights in gfx. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index 61f2861b1e9db8e63f5c4ce103233a0e864598dc..3e2b76419496a437fc9795f4065227bb36e92f4f 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -246,7 +246,8 @@ class UI_BASE_EXPORT ResourceBundle {
// 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);
+ gfx::Font::FontStyle style = gfx::Font::NORMAL,
+ gfx::Font::Weight weight = gfx::Font::Weight::NORMAL);
// Returns the primary font from the FontList given by GetFontListWithDelta().
const gfx::Font& GetFontWithDelta(
@@ -314,6 +315,8 @@ class UI_BASE_EXPORT ResourceBundle {
class ResourceBundleImageSource;
friend class ResourceBundleImageSource;
+ struct FontKey;
+
typedef base::hash_map<int, base::string16> IdToStringMap;
// Ctor/dtor are private, since we're a singleton.
@@ -433,7 +436,7 @@ class UI_BASE_EXPORT ResourceBundle {
// 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_;
+ std::map<FontKey, gfx::FontList> font_cache_;
base::FilePath overridden_pak_path_;

Powered by Google App Engine
This is Rietveld 408576698