diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:43:03 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:43:03 +0000 |
| commit | c6ac841f51c0b884b38e917ac30b1dfde0dc43a7 (patch) | |
| tree | 2b490ffa6795f72e7232d658b766785f0de64e38 /app/resource_bundle.cc | |
| parent | 6b32b95cff99ee72fd7824237ae5070263e5c496 (diff) | |
| download | chromium_src-c6ac841f51c0b884b38e917ac30b1dfde0dc43a7.zip chromium_src-c6ac841f51c0b884b38e917ac30b1dfde0dc43a7.tar.gz chromium_src-c6ac841f51c0b884b38e917ac30b1dfde0dc43a7.tar.bz2 | |
Rework gfx::Font by moving platform-specific code into inner classes.
gfx::Font is a platform-neutral API shim that exists as a wrapper object to allow for the creation and lifetime of gfx::Font objects to remain consistent with past usage.
gfx::PlatformFont is an interface implemented by the platform-specific inner classes (gfx::PlatformFontWin,Mac,Gtk).
BUG=none
TEST=existing unittests
Review URL: http://codereview.chromium.org/3083022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle.cc')
| -rw-r--r-- | app/resource_bundle.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc index 25b0d81..4b97c90 100644 --- a/app/resource_bundle.cc +++ b/app/resource_bundle.cc @@ -172,7 +172,7 @@ void ResourceBundle::LoadFontsIfNecessary() { bold_font_.reset(new gfx::Font()); *bold_font_ = - base_font_->DeriveFont(0, base_font_->style() | gfx::Font::BOLD); + base_font_->DeriveFont(0, base_font_->GetStyle() | gfx::Font::BOLD); small_font_.reset(new gfx::Font()); *small_font_ = base_font_->DeriveFont(-2); @@ -182,7 +182,7 @@ void ResourceBundle::LoadFontsIfNecessary() { medium_bold_font_.reset(new gfx::Font()); *medium_bold_font_ = - base_font_->DeriveFont(3, base_font_->style() | gfx::Font::BOLD); + base_font_->DeriveFont(3, base_font_->GetStyle() | gfx::Font::BOLD); large_font_.reset(new gfx::Font()); *large_font_ = base_font_->DeriveFont(8); |