diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
| commit | de56f378336660dcc848763c80267a5e063ae47d (patch) | |
| tree | 7f551b88923b35bc4022ce6ab3a3f602fb60d91c /webkit/pending/SimpleFontData.h | |
| parent | dc4f63c80cb90efe594131030aad6776e5945fcc (diff) | |
| download | chromium_src-de56f378336660dcc848763c80267a5e063ae47d.zip chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.gz chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.bz2 | |
Merge the chrome_webkit_merge_branch back on to trunk. This brings us
up to webkit@36102.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/pending/SimpleFontData.h')
| -rw-r--r-- | webkit/pending/SimpleFontData.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/webkit/pending/SimpleFontData.h b/webkit/pending/SimpleFontData.h index e68b249..1c066a4 100644 --- a/webkit/pending/SimpleFontData.h +++ b/webkit/pending/SimpleFontData.h @@ -1,7 +1,7 @@ /* * This file is part of the internal font implementation. * - * Copyright (C) 2006 Apple Computer, Inc. + * Copyright (C) 2006, 2008 Apple Computer, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -37,6 +37,10 @@ typedef struct OpaqueATSUStyle* ATSUStyle; #include <usp10.h> #endif +#if PLATFORM(CAIRO) +#include <cairo.h> +#endif + namespace WebCore { class FontDescription; @@ -134,6 +138,12 @@ private: void commonInit(); +#if PLATFORM(WIN) + void initGDIFont(); + void platformCommonDestroy(); + float widthForGDIGlyph(Glyph glyph) const; +#endif + public: int m_ascent; int m_descent; @@ -165,7 +175,7 @@ public: mutable SimpleFontData* m_smallCapsFontData; -#if PLATFORM(CG) +#if PLATFORM(CG) || PLATFORM(WIN) float m_syntheticBoldOffset; #endif |