diff options
Diffstat (limited to 'WebCore/loader/CachedFont.cpp')
-rw-r--r-- | WebCore/loader/CachedFont.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/WebCore/loader/CachedFont.cpp b/WebCore/loader/CachedFont.cpp index 922fc91..7edaf4b 100644 --- a/WebCore/loader/CachedFont.cpp +++ b/WebCore/loader/CachedFont.cpp @@ -31,7 +31,11 @@ #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" @@ -60,7 +64,7 @@ CachedFont::CachedFont(const String &url) CachedFont::~CachedFont() { -#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && PLATFORM(WIN_OS)) +#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) delete m_fontData; #endif } @@ -71,10 +75,8 @@ void CachedFont::load(DocLoader*) m_loading = true; } -void CachedFont::addClient(CachedResourceClient* c) +void CachedFont::didAddClient(CachedResourceClient* c) { - CachedResource::addClient(c); - if (!m_loading) c->fontLoaded(this); } @@ -100,7 +102,11 @@ 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 @@ -119,7 +125,11 @@ 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 @@ -175,7 +185,7 @@ SVGFontElement* CachedFont::getSVGFontById(const String& fontName) const void CachedFont::allClientsRemoved() { -#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && PLATFORM(WIN_OS)) +#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) if (m_fontData) { delete m_fontData; m_fontData = 0; |