Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Unified Diff: ui/gfx/platform_font_pango.h

Issue 79263004: Enables font-related unittests again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a test breakage on Windows. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/platform_font_pango.h
diff --git a/ui/gfx/platform_font_pango.h b/ui/gfx/platform_font_pango.h
index 136bf671d4d533cd439bf6cf3a534a3053762994..2750d681a26efea69884f89d9eec429d4abcd053 100644
--- a/ui/gfx/platform_font_pango.h
+++ b/ui/gfx/platform_font_pango.h
@@ -55,6 +55,7 @@ class GFX_EXPORT PlatformFontPango : public PlatformFont {
virtual int GetExpectedTextWidth(int length) const OVERRIDE;
virtual int GetStyle() const OVERRIDE;
virtual std::string GetFontName() const OVERRIDE;
+ virtual std::string GetActualFontName() const OVERRIDE;
virtual int GetFontSize() const OVERRIDE;
virtual NativeFont GetNativeFont() const OVERRIDE;
@@ -75,8 +76,8 @@ class GFX_EXPORT PlatformFontPango : public PlatformFont {
void InitWithNameAndSize(const std::string& font_name, int font_size);
void InitWithTypefaceNameSizeAndStyle(
const skia::RefPtr<SkTypeface>& typeface,
- const std::string& name,
- int size,
+ const std::string& font_family,
+ int font_size,
int style);
void InitFromPlatformFont(const PlatformFontPango* other);

Powered by Google App Engine
This is Rietveld 408576698