diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-12 14:04:52 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-12 14:04:52 +0100 |
| commit | fd3864ec9aa8cde804c27b9381b4e8a73ccf6583 (patch) | |
| tree | b31d1ef0bbed97771d607da5afc5b7850f6fc8f9 /WebCore/loader/CachedFont.cpp | |
| parent | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (diff) | |
| download | external_webkit-fd3864ec9aa8cde804c27b9381b4e8a73ccf6583.zip external_webkit-fd3864ec9aa8cde804c27b9381b4e8a73ccf6583.tar.gz external_webkit-fd3864ec9aa8cde804c27b9381b4e8a73ccf6583.tar.bz2 | |
dom, html and loader merges
Diffstat (limited to 'WebCore/loader/CachedFont.cpp')
| -rw-r--r-- | WebCore/loader/CachedFont.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
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<int>(size), bold, italic, renderingMode); #else |