From fd3864ec9aa8cde804c27b9381b4e8a73ccf6583 Mon Sep 17 00:00:00 2001 From: Andrei Popescu Date: Wed, 12 Aug 2009 14:04:52 +0100 Subject: dom, html and loader merges --- WebCore/loader/CachedFont.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'WebCore/loader/CachedFont.cpp') diff --git a/WebCore/loader/CachedFont.cpp b/WebCore/loader/CachedFont.cpp index 7edaf4b..dfb9dd8 100644 --- a/WebCore/loader/CachedFont.cpp +++ b/WebCore/loader/CachedFont.cpp @@ -31,11 +31,7 @@ #include "CachedResourceClientWalker.h" #include "DOMImplementation.h" #include "FontPlatformData.h" -#ifdef MANUAL_MERGE_REQUIRED -#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && PLATFORM(WIN_OS)) || PLATFORM(SGL) -#else // MANUAL_MERGE_REQUIRED #if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) -#endif // MANUAL_MERGE_REQUIRED #include "FontCustomPlatformData.h" #endif #include "TextResourceDecoder.h" @@ -102,11 +98,7 @@ void CachedFont::beginLoadIfNeeded(DocLoader* dl) bool CachedFont::ensureCustomFontData() { -#ifdef MANUAL_MERGE_REQUIRED -#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && PLATFORM(WIN_OS)) || PLATFORM(SGL) -#else // MANUAL_MERGE_REQUIRED #if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) -#endif // MANUAL_MERGE_REQUIRED #if ENABLE(SVG_FONTS) ASSERT(!m_isSVGFont); #endif @@ -125,11 +117,7 @@ FontPlatformData CachedFont::platformDataFromCustomData(float size, bool bold, b if (m_externalSVGDocument) return FontPlatformData(size, bold, italic); #endif -#ifdef MANUAL_MERGE_REQUIRED -#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && PLATFORM(WIN_OS)) || PLATFORM(SGL) -#else // MANUAL_MERGE_REQUIRED #if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) -#endif // MANUAL_MERGE_REQUIRED ASSERT(m_fontData); return m_fontData->fontPlatformData(static_cast(size), bold, italic, renderingMode); #else -- cgit v1.1