diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 23:55:37 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 23:55:37 +0000 |
| commit | 610ae5f3c2e8ee2bd7ecf4cbef5aaeb2ac0b1a68 (patch) | |
| tree | e275e905152f02a814386ba779eb1c15e9e8dd99 /printing/print_settings_initializer.cc | |
| parent | c1e45f4712de9f686e39f947c8e49eb28f352bf7 (diff) | |
| download | chromium_src-610ae5f3c2e8ee2bd7ecf4cbef5aaeb2ac0b1a68.zip chromium_src-610ae5f3c2e8ee2bd7ecf4cbef5aaeb2ac0b1a68.tar.gz chromium_src-610ae5f3c2e8ee2bd7ecf4cbef5aaeb2ac0b1a68.tar.bz2 | |
Change string16 to std::string in the gfx::Font() interface.
Most consumers on all platforms (including windows!) were converting the font family/GetFontName() result to UTF8. (Windows was still having to convert for the SkTypeface calls.) On Linux, we're performing a UTF16ToUTF8 on each string print (and this is showing up in pprof output.)
BUG=100803
TEST=none
Review URL: http://codereview.chromium.org/8392017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/print_settings_initializer.cc')
| -rw-r--r-- | printing/print_settings_initializer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc index 7a0f0e3c..8d9065d 100644 --- a/printing/print_settings_initializer.cc +++ b/printing/print_settings_initializer.cc @@ -42,7 +42,7 @@ void PrintSettingsInitializer::InitHeaderFooterStrings( } gfx::Font font( - UTF8ToUTF16(kSettingHeaderFooterFontName), + kSettingHeaderFooterFontName, ceil(ConvertPointsToPixelDouble(kSettingHeaderFooterFontSize))); double segment_width = GetHeaderFooterSegmentWidth(ConvertUnitDouble( print_settings->page_setup_device_units().physical_size().width(), |