| Index: third_party/WebKit/WebCore/loader/CachedFont.cpp
|
| ===================================================================
|
| --- third_party/WebKit/WebCore/loader/CachedFont.cpp (revision 7512)
|
| +++ third_party/WebKit/WebCore/loader/CachedFont.cpp (working copy)
|
| @@ -31,7 +31,7 @@
|
| #include "CachedResourceClientWalker.h"
|
| #include "DOMImplementation.h"
|
| #include "FontPlatformData.h"
|
| -#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK)
|
| +#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && PLATFORM(WIN_OS))
|
| #include "FontCustomPlatformData.h"
|
| #endif
|
| #include "TextResourceDecoder.h"
|
| @@ -60,7 +60,7 @@
|
|
|
| CachedFont::~CachedFont()
|
| {
|
| -#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK)
|
| +#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && PLATFORM(WIN_OS))
|
| delete m_fontData;
|
| #endif
|
| }
|
| @@ -100,7 +100,7 @@
|
|
|
| bool CachedFont::ensureCustomFontData()
|
| {
|
| -#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK)
|
| +#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && PLATFORM(WIN_OS))
|
| #if ENABLE(SVG_FONTS)
|
| ASSERT(!m_isSVGFont);
|
| #endif
|
| @@ -119,7 +119,7 @@
|
| if (m_externalSVGDocument)
|
| return FontPlatformData(size, bold, italic);
|
| #endif
|
| -#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK)
|
| +#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && PLATFORM(WIN_OS))
|
| ASSERT(m_fontData);
|
| return m_fontData->fontPlatformData(static_cast<int>(size), bold, italic, renderingMode);
|
| #else
|
|
|