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

Unified Diff: Source/WebCore/platform/graphics/SimpleFontData.h

Issue 13724012: Remove Cairo support. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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
Index: Source/WebCore/platform/graphics/SimpleFontData.h
diff --git a/Source/WebCore/platform/graphics/SimpleFontData.h b/Source/WebCore/platform/graphics/SimpleFontData.h
index e9ed48f485d4a2c68e28aa88d07d30adcd975c52..842994dfdea29b0e1bd508672a0224ae0bda6115 100644
--- a/Source/WebCore/platform/graphics/SimpleFontData.h
+++ b/Source/WebCore/platform/graphics/SimpleFontData.h
@@ -54,10 +54,6 @@
#include <usp10.h>
#endif
-#if USE(CAIRO)
-#include <cairo.h>
-#endif
-
#if PLATFORM(QT)
#include <QRawFont>
#endif
@@ -151,7 +147,7 @@ public:
float adjustedSpaceWidth() const { return m_adjustedSpaceWidth; }
void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; }
-#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
float syntheticBoldOffset() const { return m_syntheticBoldOffset; }
#endif
@@ -313,7 +309,7 @@ private:
mutable OwnPtr<DerivedFontData> m_derivedFontData;
-#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
float m_syntheticBoldOffset;
#endif
@@ -366,7 +362,7 @@ ALWAYS_INLINE float SimpleFontData::widthForGlyph(Glyph glyph) const
width = m_fontData->widthForSVGGlyph(glyph, m_platformData.size());
#if ENABLE(OPENTYPE_VERTICAL)
else if (m_verticalData)
-#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
width = m_verticalData->advanceHeight(this, glyph) + m_syntheticBoldOffset;
#else
width = m_verticalData->advanceHeight(this, glyph);
« no previous file with comments | « Source/WebCore/platform/graphics/ShadowBlur.cpp ('k') | Source/WebCore/platform/graphics/clutter/DrawingBufferClutter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698