Index: gfx/platform_font_gtk.h |
=================================================================== |
--- gfx/platform_font_gtk.h (revision 71043) |
+++ gfx/platform_font_gtk.h (working copy) |
@@ -20,7 +20,7 @@ |
PlatformFontGtk(); |
explicit PlatformFontGtk(const Font& other); |
explicit PlatformFontGtk(NativeFont native_font); |
- PlatformFontGtk(const std::wstring& font_name, |
+ PlatformFontGtk(const string16& font_name, |
int font_size); |
// Converts |gfx_font| to a new pango font. Free the returned font with |
@@ -45,7 +45,7 @@ |
virtual int GetStringWidth(const string16& text) const; |
virtual int GetExpectedTextWidth(int length) const; |
virtual int GetStyle() const; |
- virtual const std::wstring& GetFontName() const; |
+ virtual string16 GetFontName() const; |
virtual int GetFontSize() const; |
virtual NativeFont GetNativeFont() const; |
@@ -53,15 +53,15 @@ |
// Create a new instance of this object with the specified properties. Called |
// from DeriveFont. |
PlatformFontGtk(SkTypeface* typeface, |
- const std::wstring& name, |
+ const string16& name, |
int size, |
int style); |
virtual ~PlatformFontGtk(); |
// Initialize this object. |
- void InitWithNameAndSize(const std::wstring& font_name, int font_size); |
+ void InitWithNameAndSize(const string16& font_name, int font_size); |
void InitWithTypefaceNameSizeAndStyle(SkTypeface* typeface, |
- const std::wstring& name, |
+ const string16& name, |
int size, |
int style); |
void InitFromPlatformFont(const PlatformFontGtk* other); |
@@ -86,7 +86,7 @@ |
// Additional information about the face |
// Skia actually expects a family name and not a font name. |
- std::wstring font_family_; |
+ string16 font_family_; |
int font_size_; |
int style_; |