| Index: Source/platform/fonts/SimpleFontData.cpp
|
| diff --git a/Source/platform/fonts/SimpleFontData.cpp b/Source/platform/fonts/SimpleFontData.cpp
|
| index b6846b2ac0032e5038a218a93f7f545187413171..4d5b4a9c15ad6fc646f305adcf9ece3d09ad7d9b 100644
|
| --- a/Source/platform/fonts/SimpleFontData.cpp
|
| +++ b/Source/platform/fonts/SimpleFontData.cpp
|
| @@ -47,7 +47,7 @@ SimpleFontData::SimpleFontData(const FontPlatformData& platformData, PassRefPtr<
|
| , m_isTextOrientationFallback(isTextOrientationFallback)
|
| , m_isBrokenIdeographFallback(false)
|
| #if ENABLE(OPENTYPE_VERTICAL)
|
| - , m_verticalData(0)
|
| + , m_verticalData(nullptr)
|
| #endif
|
| , m_hasVerticalGlyphs(false)
|
| , m_customFontData(customData)
|
| @@ -69,7 +69,7 @@ SimpleFontData::SimpleFontData(PassRefPtr<CustomFontData> customData, float font
|
| , m_isTextOrientationFallback(false)
|
| , m_isBrokenIdeographFallback(false)
|
| #if ENABLE(OPENTYPE_VERTICAL)
|
| - , m_verticalData(0)
|
| + , m_verticalData(nullptr)
|
| #endif
|
| , m_hasVerticalGlyphs(false)
|
| , m_customFontData(customData)
|
| @@ -176,7 +176,7 @@ PassRefPtr<SimpleFontData> SimpleFontData::verticalRightOrientationFontData() co
|
| if (!m_derivedFontData->verticalRightOrientation) {
|
| FontPlatformData verticalRightPlatformData(m_platformData);
|
| verticalRightPlatformData.setOrientation(Horizontal);
|
| - m_derivedFontData->verticalRightOrientation = create(verticalRightPlatformData, isCustomFont() ? CustomFontData::create(false): 0, true);
|
| + m_derivedFontData->verticalRightOrientation = create(verticalRightPlatformData, isCustomFont() ? CustomFontData::create(false): nullptr, true);
|
| }
|
| return m_derivedFontData->verticalRightOrientation;
|
| }
|
| @@ -186,7 +186,7 @@ PassRefPtr<SimpleFontData> SimpleFontData::uprightOrientationFontData() const
|
| if (!m_derivedFontData)
|
| m_derivedFontData = DerivedFontData::create(isCustomFont());
|
| if (!m_derivedFontData->uprightOrientation)
|
| - m_derivedFontData->uprightOrientation = create(m_platformData, isCustomFont() ? CustomFontData::create(false): 0, true);
|
| + m_derivedFontData->uprightOrientation = create(m_platformData, isCustomFont() ? CustomFontData::create(false): nullptr, true);
|
| return m_derivedFontData->uprightOrientation;
|
| }
|
|
|
| @@ -215,7 +215,7 @@ PassRefPtr<SimpleFontData> SimpleFontData::brokenIdeographFontData() const
|
| if (!m_derivedFontData)
|
| m_derivedFontData = DerivedFontData::create(isCustomFont());
|
| if (!m_derivedFontData->brokenIdeograph) {
|
| - m_derivedFontData->brokenIdeograph = create(m_platformData, isCustomFont() ? CustomFontData::create(false): 0);
|
| + m_derivedFontData->brokenIdeograph = create(m_platformData, isCustomFont() ? CustomFontData::create(false): nullptr);
|
| m_derivedFontData->brokenIdeograph->m_isBrokenIdeographFallback = true;
|
| }
|
| return m_derivedFontData->brokenIdeograph;
|
| @@ -259,7 +259,7 @@ PassRefPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescri
|
| {
|
| // FIXME: Support scaled SVG fonts. Given that SVG is scalable in general this should be achievable.
|
| if (isSVGFont())
|
| - return 0;
|
| + return nullptr;
|
|
|
| return platformCreateScaledFontData(fontDescription, scaleFactor);
|
| }
|
|
|