Skip to content
  • wangxianzhu@chromium.org's avatar
    Variant of non-primary fell-back SVGFont causes crash. · 1430de0e
    wangxianzhu@chromium.org authored
    https://bugs.webkit.org/show_bug.cgi?id=112367
    
    Reviewed by Stephen Chenney.
    
    Source/WebCore:
    
    Don't go to PlatformFontData path for SimpleFontData::createScaledFontData()
    for SVG fonts.
    
    Test: svg/css/font-face-variant-crash.html
    
    * platform/graphics/SimpleFontData.cpp:
    (WebCore::SimpleFontData::~SimpleFontData):
    (WebCore::SimpleFontData::createScaledFontData): Don't go to PlatformFontData path for SVG fonts.
    (WebCore):
    * platform/graphics/SimpleFontData.h:
    (SimpleFontData): Added createScaledFontData and renamed the original createScaledFontData to platformCreateScaledFontData.
                      BTW, Removed unreferenced commonInit.
    * platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp:
    (WebCore::SimpleFontData::platformCreateScaledFontData): Renamed from createScaledFontData.
    * platform/graphics/chromium/SimpleFontDataChromiumWin.cpp:
    (WebCore::SimpleFontData::platformCreateScaledFontData): Ditto.
    * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
    (WebCore::SimpleFontData::platformCreateScaledFontData): Ditto.
    * platform/graphics/mac/SimpleFontDataMac.mm:
    (WebCore::SimpleFontData::platformCreateScaledFontData): Ditto.
    * platform/graphics/qt/SimpleFontDataQt.cpp:
    (WebCore::SimpleFontData::platformCreateScaledFontData): Ditto.
    * platform/graphics/skia/SimpleFontDataSkia.cpp:
    (WebCore::SimpleFontData::platformCreateScaledFontData): Ditto.
    * platform/graphics/win/SimpleFontDataWin.cpp:
    (WebCore::SimpleFontData::platformCreateScaledFontData): Ditto.
    * platform/graphics/wince/SimpleFontDataWinCE.cpp:
    (WebCore::SimpleFontData::platformCreateScaledFontData): Ditto.
    * platform/graphics/wx/SimpleFontDataWx.cpp:
    (WebCore::SimpleFontData::platformCreateScaledFontData): Ditto.
    
    LayoutTests:
    
    * resources/SpaceOnly.otf: Added. A font containing only the space glyph for testing font fallback.
    * svg/css/font-face-variant-crash-expected.txt: Added.
    * svg/css/font-face-variant-crash.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146129 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    1430de0e