diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 20:53:29 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 20:53:29 +0000 |
| commit | 2bb1b7efb0d745599287ba2807e6413b88025ba1 (patch) | |
| tree | 9ca6cdf8794d14e1569a6a51fadd563d93044275 /ui/gfx/pango_util.h | |
| parent | 79fcd382548808dcab8f58e736d4608bbed6c828 (diff) | |
| download | chromium_src-2bb1b7efb0d745599287ba2807e6413b88025ba1.zip chromium_src-2bb1b7efb0d745599287ba2807e6413b88025ba1.tar.gz chromium_src-2bb1b7efb0d745599287ba2807e6413b88025ba1.tar.bz2 | |
Revert 114953 (breaks cros font sizes, etc.) - specify locale-dependent font list for UI on ChromeOS, so that those fonts have higher priority over the fallback fonts Pango picks up.
BUG=103860
TEST=build aura, start chromium in 'ar' locale. type in Arabic and check the Arabic text's shapes. remove IDS_UI_FONT_FAMILY_CROS from 'ar' resource file, build aura again, start chromium in 'ar', type in Arabic and the Arabic text's shapes should be different.
Review URL: http://codereview.chromium.org/8770034
TBR=xji@chromium.org
Review URL: http://codereview.chromium.org/9007028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/pango_util.h')
| -rw-r--r-- | ui/gfx/pango_util.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ui/gfx/pango_util.h b/ui/gfx/pango_util.h index 93b9bf2..903e6df 100644 --- a/ui/gfx/pango_util.h +++ b/ui/gfx/pango_util.h @@ -8,7 +8,6 @@ #include <cairo/cairo.h> #include <pango/pango.h> -#include <string> #include "base/i18n/rtl.h" #include "base/string16.h" @@ -48,17 +47,6 @@ void SetupPangoLayout(PangoLayout* layout, base::i18n::TextDirection text_direction, int flags); - -// Setup pango layout |layout| the same way as SetupPangoLayout(), except this -// sets the font description based on |font_description|. -void SetupPangoLayoutWithFontDescription( - PangoLayout* layout, - const string16& text, - const std::string& font_description, - int width, - base::i18n::TextDirection text_direction, - int flags); - // Get Pango's calculated size of |layout| and modify |text_rect| within // |bounds|. void AdjustTextRectBasedOnLayout(PangoLayout* layout, |