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

Unified Diff: app/gfx/font.h

Issue 199105: Continue with the FreeBSD port - this version builds and links, though... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 3 months 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
« no previous file with comments | « app/gfx/canvas.h ('k') | app/gfx/path.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « app/gfx/canvas.h ('k') | app/gfx/path.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698