summaryrefslogtreecommitdiffstats
path: root/app/gfx
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 16:43:03 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 16:43:03 +0000
commitc6ac841f51c0b884b38e917ac30b1dfde0dc43a7 (patch)
tree2b490ffa6795f72e7232d658b766785f0de64e38 /app/gfx
parent6b32b95cff99ee72fd7824237ae5070263e5c496 (diff)
downloadchromium_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/gfx')
-rw-r--r--app/gfx/font_util.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/gfx/font_util.cc b/app/gfx/font_util.cc
index 61e1b52dd..1c3cfca 100644
--- a/app/gfx/font_util.cc
+++ b/app/gfx/font_util.cc
@@ -27,7 +27,7 @@ int GetLocalizedContentsHeightForFont(int row_resource_id,
double lines = 0;
base::StringToDouble(WideToUTF8(l10n_util::GetString(row_resource_id)),
&lines);
- int height = static_cast<int>(font.height() * lines);
+ int height = static_cast<int>(font.GetHeight() * lines);
DCHECK_GT(height, 0);
return height;
}