diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/GlyphBuffer.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/GlyphBuffer.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Source/WebCore/platform/graphics/GlyphBuffer.h b/Source/WebCore/platform/graphics/GlyphBuffer.h index 7aac1e3..f5216a9 100644 --- a/Source/WebCore/platform/graphics/GlyphBuffer.h +++ b/Source/WebCore/platform/graphics/GlyphBuffer.h @@ -34,11 +34,11 @@ #include <wtf/UnusedParam.h> #include <wtf/Vector.h> -#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) +#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) #include <ApplicationServices/ApplicationServices.h> #endif -#if PLATFORM(CAIRO) || (PLATFORM(WX) && defined(__WXGTK__)) +#if USE(CAIRO) || (PLATFORM(WX) && defined(__WXGTK__)) #include <cairo.h> #endif @@ -47,7 +47,7 @@ namespace WebCore { typedef unsigned short Glyph; class SimpleFontData; -#if PLATFORM(CAIRO) +#if USE(CAIRO) // FIXME: Why does Cairo use such a huge struct instead of just an offset into an array? typedef cairo_glyph_t GlyphBufferGlyph; #elif OS(WINCE) @@ -58,7 +58,7 @@ typedef Glyph GlyphBufferGlyph; // CG uses CGSize instead of FloatSize so that the result of advances() // can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm -#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) +#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) typedef CGSize GlyphBufferAdvance; #elif OS(WINCE) // There is no cross-platform code that uses the height of GlyphBufferAdvance, @@ -113,7 +113,7 @@ public: Glyph glyphAt(int index) const { -#if PLATFORM(CAIRO) +#if USE(CAIRO) return m_glyphs[index].index; #else return m_glyphs[index]; @@ -122,7 +122,7 @@ public: float advanceAt(int index) const { -#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) +#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) return m_advances[index].width; #elif OS(WINCE) return m_advances[index]; @@ -145,7 +145,7 @@ public: { m_fontData.append(font); -#if PLATFORM(CAIRO) +#if USE(CAIRO) cairo_glyph_t cairoGlyph; cairoGlyph.index = glyph; m_glyphs.append(cairoGlyph); @@ -153,7 +153,7 @@ public: m_glyphs.append(glyph); #endif -#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) +#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) CGSize advance = { width, 0 }; m_advances.append(advance); #elif OS(WINCE) @@ -176,7 +176,7 @@ public: void add(Glyph glyph, const SimpleFontData* font, GlyphBufferAdvance advance) { m_fontData.append(font); -#if PLATFORM(CAIRO) +#if USE(CAIRO) cairo_glyph_t cairoGlyph; cairoGlyph.index = glyph; m_glyphs.append(cairoGlyph); @@ -192,7 +192,7 @@ public: { ASSERT(!isEmpty()); GlyphBufferAdvance& lastAdvance = m_advances.last(); -#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) +#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) lastAdvance.width += width; #elif OS(WINCE) lastAdvance += width; |