diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 22:16:00 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 22:16:00 +0000 |
| commit | 58b1db1b7575bc4de4a31605eeacb0ed298cca02 (patch) | |
| tree | 5418b2074a6281bdfc2dc8cd4ceb905f7616a520 /app/gfx/canvas_linux.cc | |
| parent | 26012f91aa8cb47d845d68af6afdcec483e92754 (diff) | |
| download | chromium_src-58b1db1b7575bc4de4a31605eeacb0ed298cca02.zip chromium_src-58b1db1b7575bc4de4a31605eeacb0ed298cca02.tar.gz chromium_src-58b1db1b7575bc4de4a31605eeacb0ed298cca02.tar.bz2 | |
Reverts r26015. It caused a startup regression:(
BUG=20823
TEST=none
TBR=agl
Review URL: http://codereview.chromium.org/203041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26030 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 |