| Index: app/gfx/font.h
|
| ===================================================================
|
| --- app/gfx/font.h (revision 25977)
|
| +++ app/gfx/font.h (working copy)
|
| @@ -11,7 +11,7 @@
|
|
|
| #if defined(OS_WIN)
|
| typedef struct HFONT__* HFONT;
|
| -#elif defined(OS_LINUX)
|
| +#elif defined(USE_X11)
|
| #include "third_party/skia/include/core/SkRefCnt.h"
|
| class SkPaint;
|
| class SkTypeface;
|
| @@ -26,7 +26,7 @@
|
| class NSFont;
|
| #endif
|
| typedef NSFont* NativeFont;
|
| -#elif defined(OS_LINUX)
|
| +#elif defined(USE_X11)
|
| typedef struct _PangoFontDescription PangoFontDescription;
|
| class SkTypeface;
|
| typedef SkTypeface* NativeFont;
|
| @@ -124,7 +124,7 @@
|
| int vertical_dlus_to_pixels(int dlus) {
|
| return dlus * font_ref_->height() / 8;
|
| }
|
| -#elif defined(OS_LINUX)
|
| +#elif defined(USE_X11)
|
| static Font CreateFont(PangoFontDescription* desc);
|
| // We need a copy constructor and assignment operator to deal with
|
| // the Skia reference counting.
|
| @@ -195,7 +195,7 @@
|
|
|
| // Indirect reference to the HFontRef, which references the underlying HFONT.
|
| scoped_refptr<HFontRef> font_ref_;
|
| -#elif defined(OS_LINUX)
|
| +#elif defined(USE_X11)
|
| explicit Font(SkTypeface* typeface, const std::wstring& name,
|
| int size, int style);
|
| // Calculate and cache the font metrics.
|
|
|