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

Unified Diff: Source/WebCore/platform/graphics/FontPlatformData.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
« no previous file with comments | « Source/WebCore/platform/graphics/FloatRect.h ('k') | Source/WebCore/platform/graphics/FontPlatformData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/FontPlatformData.h
diff --git a/Source/WebCore/platform/graphics/FontPlatformData.h b/Source/WebCore/platform/graphics/FontPlatformData.h
index 28841e75c307bcc2c48f6762bb146169c61d66ed..661f8102ddbd5ac947a57bd0dc6d0bfc0abe9198 100644
--- a/Source/WebCore/platform/graphics/FontPlatformData.h
+++ b/Source/WebCore/platform/graphics/FontPlatformData.h
@@ -45,11 +45,6 @@
#include "RefCountedGDIHandle.h"
#endif
-#if USE(CAIRO)
-#include <wtf/HashFunctions.h>
-#include <cairo.h>
-#endif
-
#if OS(DARWIN)
OBJC_CLASS NSFont;
@@ -118,9 +113,6 @@ public:
FontPlatformData(HFONT, CGFontRef, float size, bool syntheticBold, bool syntheticOblique, bool useGDI);
#endif
#endif
-#if USE(CAIRO)
- FontPlatformData(cairo_font_face_t*, float size, bool bold, bool italic);
-#endif
~FontPlatformData();
@@ -159,17 +151,13 @@ public:
void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
-#if USE(CAIRO)
- cairo_scaled_font_t* scaledFont() const { return m_scaledFont; }
-#endif
-
#if PLATFORM(CHROMIUM) && OS(DARWIN)
HarfBuzzFace* harfBuzzFace();
#endif
unsigned hash() const
{
-#if PLATFORM(WIN) && !USE(CAIRO)
+#if PLATFORM(WIN)
return m_font ? m_font->hash() : 0;
#elif OS(DARWIN)
#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
@@ -177,8 +165,6 @@ public:
#endif
uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, static_cast<uintptr_t>(m_isPrinterFont << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique) };
return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
-#elif USE(CAIRO)
- return PtrHash<cairo_scaled_font_t*>::hash(m_scaledFont);
#endif
}
@@ -201,16 +187,14 @@ public:
bool isHashTableDeletedValue() const
{
-#if PLATFORM(WIN) && !USE(CAIRO)
+#if PLATFORM(WIN)
return m_font.isHashTableDeletedValue();
#elif OS(DARWIN)
return m_font == hashTableDeletedFontValue();
-#elif USE(CAIRO)
- return m_scaledFont == hashTableDeletedFontValue();
#endif
}
-#if PLATFORM(WIN) && (USE(CG) || USE(CAIRO))
+#if PLATFORM(WIN) && USE(CG)
PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
#endif
@@ -235,10 +219,6 @@ private:
void platformDataInit(HFONT, float size, HDC, WCHAR* faceName);
#endif
-#if USE(CAIRO)
- static cairo_scaled_font_t* hashTableDeletedFontValue() { return reinterpret_cast<cairo_scaled_font_t*>(-1); }
-#endif
-
public:
bool m_syntheticBold;
bool m_syntheticOblique;
@@ -262,10 +242,6 @@ private:
#endif
#endif
-#if USE(CAIRO)
- cairo_scaled_font_t* m_scaledFont;
-#endif
-
#if PLATFORM(CHROMIUM) && OS(DARWIN)
RefPtr<MemoryActivatedFont> m_inMemoryFont;
RefPtr<HarfBuzzFace> m_harfBuzzFace;
« no previous file with comments | « Source/WebCore/platform/graphics/FloatRect.h ('k') | Source/WebCore/platform/graphics/FontPlatformData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698