diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 20:55:55 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 20:55:55 +0000 |
| commit | 0d3c28e8983a614e5858d4b84a6cfe479adb1312 (patch) | |
| tree | defa6adae65173bd27bee5503425274dd4d7809d /app/resource_bundle.cc | |
| parent | db32931f6800e91b0d6fa5ddf7c21d4b39d98c3f (diff) | |
| download | chromium_src-0d3c28e8983a614e5858d4b84a6cfe479adb1312.zip chromium_src-0d3c28e8983a614e5858d4b84a6cfe479adb1312.tar.gz chromium_src-0d3c28e8983a614e5858d4b84a6cfe479adb1312.tar.bz2 | |
Fix up extension badge text drawing.
Fall abck to the system default font if the preferred font isn't available.
Also, only create the SkPaint struct once, not on every paint.
Also, make some more things const.
BUG=25693
TEST=badge still looks good, that crash goes away
Review URL: http://codereview.chromium.org/341045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle.cc')
| -rw-r--r-- | app/resource_bundle.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc index 28674a8..a2ebdf0 100644 --- a/app/resource_bundle.cc +++ b/app/resource_bundle.cc @@ -176,7 +176,7 @@ void ResourceBundle::LoadFontsIfNecessary() { } } -gfx::Font ResourceBundle::GetFont(FontStyle style) { +const gfx::Font& ResourceBundle::GetFont(FontStyle style) { LoadFontsIfNecessary(); switch (style) { case SmallFont: |