Title: [265414] trunk/Source/WebCore
- Revision
- 265414
- Author
- [email protected]
- Date
- 2020-08-08 23:40:00 -0700 (Sat, 08 Aug 2020)
Log Message
Fix bad merge in r265241
https://bugs.webkit.org/show_bug.cgi?id=215051
Unreviewed. This is something that got dropped in a bad merge from r265241.
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::widthForSimpleText const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (265413 => 265414)
--- trunk/Source/WebCore/ChangeLog 2020-08-09 05:14:40 UTC (rev 265413)
+++ trunk/Source/WebCore/ChangeLog 2020-08-09 06:40:00 UTC (rev 265414)
@@ -1,5 +1,15 @@
2020-08-08 Myles C. Maxfield <[email protected]>
+ Fix bad merge in r265241
+ https://bugs.webkit.org/show_bug.cgi?id=215051
+
+ Unreviewed. This is something that got dropped in a bad merge from r265241.
+
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::widthForSimpleText const):
+
+2020-08-08 Myles C. Maxfield <[email protected]>
+
Make GlyphBuffers required in the fast text codepath
https://bugs.webkit.org/show_bug.cgi?id=215052
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (265413 => 265414)
--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2020-08-09 05:14:40 UTC (rev 265413)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2020-08-09 06:40:00 UTC (rev 265414)
@@ -442,7 +442,7 @@
auto glyph = glyphDataForCharacter(text[i], false).glyph;
auto glyphWidth = font.widthForGlyph(glyph);
runWidth += glyphWidth;
- glyphBuffer.add(glyph, font, glyphWidth);
+ glyphBuffer.add(glyph, font, glyphWidth, i);
}
font.applyTransforms(glyphBuffer, 0, enableKerning(), requiresShaping(), fontDescription().computedLocale());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
