diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 19:26:49 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 19:26:49 +0000 |
| commit | 5e70f14644629b7f9fe9126553758aed25e17128 (patch) | |
| tree | 65bd07608366d1f3004535e2ca91a9089327ed92 /app/gfx/canvas_linux.cc | |
| parent | 1bf956b6f611bd3e116489bfdef7ac9048db0308 (diff) | |
| download | chromium_src-5e70f14644629b7f9fe9126553758aed25e17128.zip chromium_src-5e70f14644629b7f9fe9126553758aed25e17128.tar.gz chromium_src-5e70f14644629b7f9fe9126553758aed25e17128.tar.bz2 | |
Reverts linux font change again. Slow down isn't as bad as before. But
still not ideal.
BUG=none
TEST=none
TBR=agl
Review URL: http://codereview.chromium.org/194105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/gfx/canvas_linux.cc')
| -rw-r--r-- | app/gfx/canvas_linux.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/gfx/canvas_linux.cc b/app/gfx/canvas_linux.cc index 1614f44..7ed1904 100644 --- a/app/gfx/canvas_linux.cc +++ b/app/gfx/canvas_linux.cc @@ -130,7 +130,9 @@ static void SetupPangoLayout(PangoLayout* layout, PANGO_WRAP_WORD_CHAR : PANGO_WRAP_WORD); } - pango_layout_set_font_description(layout, font.nativeFont()); + PangoFontDescription* desc = gfx::Font::PangoFontFromGfxFont(font); + pango_layout_set_font_description(layout, desc); + pango_font_description_free(desc); } // static |