Title: [180675] trunk/Source/WebCore
- Revision
- 180675
- Author
- [email protected]
- Date
- 2015-02-26 08:24:41 -0800 (Thu, 26 Feb 2015)
Log Message
[FreeType] REGRESSION(r180563): Introduced crashes
https://bugs.webkit.org/show_bug.cgi?id=142044
Patch by Michael Catanzaro <[email protected]> on 2015-02-26
Reviewed by Martin Robinson.
No new tests, should be caught by any woff font test.
Use optionsPattern, not m_pattern, when m_pattern may be null.
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
(WebCore::FontPlatformData::initializeWithFontFace):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (180674 => 180675)
--- trunk/Source/WebCore/ChangeLog 2015-02-26 15:21:13 UTC (rev 180674)
+++ trunk/Source/WebCore/ChangeLog 2015-02-26 16:24:41 UTC (rev 180675)
@@ -1,3 +1,17 @@
+2015-02-26 Michael Catanzaro <[email protected]>
+
+ [FreeType] REGRESSION(r180563): Introduced crashes
+ https://bugs.webkit.org/show_bug.cgi?id=142044
+
+ Reviewed by Martin Robinson.
+
+ No new tests, should be caught by any woff font test.
+
+ Use optionsPattern, not m_pattern, when m_pattern may be null.
+
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+ (WebCore::FontPlatformData::initializeWithFontFace):
+
2015-02-26 Sergio Villar Senin <[email protected]>
ASSERTION FAILED: !length.isUndefined() in WebCore::GridLength::GridLength
Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (180674 => 180675)
--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2015-02-26 15:21:13 UTC (rev 180674)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2015-02-26 16:24:41 UTC (rev 180675)
@@ -320,14 +320,14 @@
FcMatrixInit(&fontConfigMatrix);
// These matrices may be stacked in the pattern, so it's our job to get them all and multiply them.
- for (int i = 0; FcPatternGetMatrix(m_pattern.get(), FC_MATRIX, i, &tempFontConfigMatrix) == FcResultMatch; i++)
+ for (int i = 0; FcPatternGetMatrix(optionsPattern, FC_MATRIX, i, &tempFontConfigMatrix) == FcResultMatch; i++)
FcMatrixMultiply(&fontConfigMatrix, &fontConfigMatrix, tempFontConfigMatrix);
cairo_matrix_init(&fontMatrix, fontConfigMatrix.xx, -fontConfigMatrix.yx,
-fontConfigMatrix.xy, fontConfigMatrix.yy, 0, 0);
// We requested an italic font, but Fontconfig gave us one that was neither oblique nor italic.
int actualFontSlant;
- if (fontDescription.italic() && FcPatternGetInteger(m_pattern.get(), FC_SLANT, 0, &actualFontSlant) == FcResultMatch)
+ if (fontDescription.italic() && FcPatternGetInteger(optionsPattern, FC_SLANT, 0, &actualFontSlant) == FcResultMatch)
m_syntheticOblique = actualFontSlant == FC_SLANT_ROMAN;
// The matrix from FontConfig does not include the scale.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
