Diff
Modified: trunk/Source/WebCore/ChangeLog (277046 => 277047)
--- trunk/Source/WebCore/ChangeLog 2021-05-05 22:30:31 UTC (rev 277046)
+++ trunk/Source/WebCore/ChangeLog 2021-05-05 22:46:02 UTC (rev 277047)
@@ -1,5 +1,25 @@
2021-05-05 Cameron McCormack <hey...@apple.com>
+ Rename DisplayList::Recorder::appendDrawGraphsItemWithCachedFont.
+ https://bugs.webkit.org/show_bug.cgi?id=225382
+
+ Reviewed by Simon Fraser.
+
+ It appends a DrawGlyphsItem, not a DrawGraphsItem.
+
+ * platform/graphics/displaylists/DisplayListDrawGlyphsRecorderCoreText.cpp:
+ (WebCore::DisplayList::DrawGlyphsRecorder::recordDrawGlyphs):
+ (WebCore::DisplayList::DrawGlyphsRecorder::drawGlyphs):
+ * platform/graphics/displaylists/DisplayListDrawGlyphsRecorderHarfBuzz.cpp:
+ (WebCore::DisplayList::DrawGlyphsRecorder::drawGlyphs):
+ * platform/graphics/displaylists/DisplayListDrawGlyphsRecorderWin.cpp:
+ (WebCore::DisplayList::DrawGlyphsRecorder::drawGlyphs):
+ * platform/graphics/displaylists/DisplayListRecorder.cpp:
+ (WebCore::DisplayList::Recorder::appendDrawGlyphsItemWithCachedFont):
+ * platform/graphics/displaylists/DisplayListRecorder.h:
+
+2021-05-05 Cameron McCormack <hey...@apple.com>
+
Fix copy paste error in Recorder::canAppendItemOfType.
https://bugs.webkit.org/show_bug.cgi?id=225380
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderCoreText.cpp (277046 => 277047)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderCoreText.cpp 2021-05-05 22:30:31 UTC (rev 277046)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderCoreText.cpp 2021-05-05 22:46:02 UTC (rev 277047)
@@ -336,7 +336,7 @@
updateStrokeColor(CGGStateGetStrokeColor(gstate));
updateShadow(CGGStateGetStyle(gstate));
- m_owner.appendDrawGraphsItemWithCachedFont(*m_originalFont, glyphs, computeAdvancesFromPositions(positions, count, currentTextMatrix).data(), count, currentTextMatrix.mapPoint(positions[0]), m_smoothingMode);
+ m_owner.appendDrawGlyphsItemWithCachedFont(*m_originalFont, glyphs, computeAdvancesFromPositions(positions, count, currentTextMatrix).data(), count, currentTextMatrix.mapPoint(positions[0]), m_smoothingMode);
m_owner.concatCTM(inverseCTMFixup);
}
@@ -414,7 +414,7 @@
void DrawGlyphsRecorder::drawGlyphs(const Font& font, const GlyphBufferGlyph* glyphs, const GlyphBufferAdvance* advances, unsigned numGlyphs, const FloatPoint& startPoint, FontSmoothingMode smoothingMode)
{
if (m_drawGlyphsDeconstruction == DrawGlyphsDeconstruction::DontDeconstruct) {
- m_owner.appendDrawGraphsItemWithCachedFont(font, glyphs, advances, numGlyphs, startPoint, smoothingMode);
+ m_owner.appendDrawGlyphsItemWithCachedFont(font, glyphs, advances, numGlyphs, startPoint, smoothingMode);
return;
}
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderHarfBuzz.cpp (277046 => 277047)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderHarfBuzz.cpp 2021-05-05 22:30:31 UTC (rev 277046)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderHarfBuzz.cpp 2021-05-05 22:46:02 UTC (rev 277047)
@@ -43,7 +43,7 @@
void DrawGlyphsRecorder::drawGlyphs(const Font& font, const GlyphBufferGlyph* glyphs, const GlyphBufferAdvance* advances, unsigned numGlyphs, const FloatPoint& startPoint, FontSmoothingMode smoothingMode)
{
- m_owner.appendDrawGraphsItemWithCachedFont(font, glyphs, advances, numGlyphs, startPoint, smoothingMode);
+ m_owner.appendDrawGlyphsItemWithCachedFont(font, glyphs, advances, numGlyphs, startPoint, smoothingMode);
}
} // namespace DisplayList
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderWin.cpp (277046 => 277047)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderWin.cpp 2021-05-05 22:30:31 UTC (rev 277046)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListDrawGlyphsRecorderWin.cpp 2021-05-05 22:46:02 UTC (rev 277047)
@@ -43,7 +43,7 @@
void DrawGlyphsRecorder::drawGlyphs(const Font& font, const GlyphBufferGlyph* glyphs, const GlyphBufferAdvance* advances, unsigned numGlyphs, const FloatPoint& startPoint, FontSmoothingMode smoothingMode)
{
- m_owner.appendDrawGraphsItemWithCachedFont(font, glyphs, advances, numGlyphs, startPoint, m_smoothingMode);
+ m_owner.appendDrawGlyphsItemWithCachedFont(font, glyphs, advances, numGlyphs, startPoint, m_smoothingMode);
}
} // namespace DisplayList
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp (277046 => 277047)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp 2021-05-05 22:30:31 UTC (rev 277046)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp 2021-05-05 22:46:02 UTC (rev 277047)
@@ -190,7 +190,7 @@
m_drawGlyphsRecorder.drawGlyphs(font, glyphs, advances, numGlyphs, startPoint, smoothingMode);
}
-void Recorder::appendDrawGraphsItemWithCachedFont(const Font& font, const GlyphBufferGlyph* glyphs, const GlyphBufferAdvance* advances, unsigned count, const FloatPoint& localAnchor, FontSmoothingMode smoothingMode)
+void Recorder::appendDrawGlyphsItemWithCachedFont(const Font& font, const GlyphBufferGlyph* glyphs, const GlyphBufferAdvance* advances, unsigned count, const FloatPoint& localAnchor, FontSmoothingMode smoothingMode)
{
if (m_delegate)
m_delegate->cacheFont(const_cast<Font&>(font));
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h (277046 => 277047)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h 2021-05-05 22:30:31 UTC (rev 277046)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h 2021-05-05 22:46:02 UTC (rev 277047)
@@ -109,7 +109,7 @@
void drawGlyphs(const Font&, const GlyphBufferGlyph*, const GlyphBufferAdvance*, unsigned numGlyphs, const FloatPoint& anchorPoint, FontSmoothingMode) override;
- void appendDrawGraphsItemWithCachedFont(const Font&, const GlyphBufferGlyph*, const GlyphBufferAdvance*, unsigned count, const FloatPoint& localAnchor, FontSmoothingMode);
+ void appendDrawGlyphsItemWithCachedFont(const Font&, const GlyphBufferGlyph*, const GlyphBufferAdvance*, unsigned count, const FloatPoint& localAnchor, FontSmoothingMode);
void drawImageBuffer(WebCore::ImageBuffer&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions&) override;
void drawNativeImage(NativeImage&, const FloatSize& imageSize, const FloatRect& destRect, const FloatRect& srcRect, const ImagePaintingOptions&) override;
