[FreeType] REGRESSION(r180563): Introduced crashes

• Component: WebCore Misc.
• Status: RESOLVED FIXED

[Michael Catanzaro]

Zan noticed the following after r180563:

> Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp:307
> -    cairo_font_options_t* options = getDefaultFontOptions();
> +    cairo_font_options_t* options = getDefaultCairoFontOptions();
> +    FcPattern* optionsPattern = m_pattern ? m_pattern.get() : getDefaultFontconfigOptions();
> +    setCairoFontOptionsFromFontConfigPattern(options, optionsPattern);

This properly checks for and works around the possibly-null m_pattern ...

> Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp:324
> +    for (int i = 0; FcPatternGetMatrix(m_pattern.get(), FC_MATRIX, i, &tempFontConfigMatrix) == FcResultMatch; i++)
> +        FcMatrixMultiply(&fontConfigMatrix, &fontConfigMatrix, tempFontConfigMatrix);

... but this doesn't anymore (though it used to), which leads to crashes.

It should be using optionsPattern rather than m_pattern.

[Michael Catanzaro]

Created attachment 247426 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 247426 [details]
Patch

Clearing flags on attachment: 247426

Committed r180675: <http://trac.webkit.org/changeset/180675>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.