Changeset 233075 in webkit

Timestamp:

Jun 22, 2018 2:49:55 AM (6 years ago)

Author:

magomez@igalia.com

Message:

[WPE][ThreadedRendering] WPE crashes rendering some pieces of text when using ThreadedRendering
​https://bugs.webkit.org/show_bug.cgi?id=186886

Reviewed by Žan Doberšek.

Modify DisplayList DrawGlyphs element to use a GraphicsContext for replaying. To do so, modify
GraphicsContext::drawGlyphs() API so it doesn't require a FontCascade, and update all the calls
to it.

Covered by existent tests.

• platform/graphics/FontCascade.cpp:

(WebCore::FontCascade::drawGlyphBuffer const):

• platform/graphics/GraphicsContext.cpp:

(WebCore::GraphicsContext::drawGlyphs):

• platform/graphics/GraphicsContext.h:
• platform/graphics/displaylists/DisplayListItems.cpp:

(WebCore::DisplayList::DrawGlyphs::apply const):

• rendering/mathml/MathOperator.cpp:

(WebCore::MathOperator::paintGlyph):
(WebCore::MathOperator::paint):

• rendering/mathml/RenderMathMLToken.cpp:

(WebCore::RenderMathMLToken::paint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontCascade.cpp (modified) (2 diffs)
• platform/graphics/GraphicsContext.cpp (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (1 diff)
• platform/graphics/displaylists/DisplayListItems.cpp (modified) (1 diff)
• rendering/mathml/MathOperator.cpp (modified) (2 diffs)
• rendering/mathml/RenderMathMLToken.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-06-22  Miguel Gomez  <magomez@igalia.com>
+
+        [WPE][ThreadedRendering] WPE crashes rendering some pieces of text when using ThreadedRendering
+        https://bugs.webkit.org/show_bug.cgi?id=186886
+
+        Reviewed by Žan Doberšek.
+
+        Modify DisplayList DrawGlyphs element to use a GraphicsContext for replaying. To do so, modify
+        GraphicsContext::drawGlyphs() API so it doesn't require a FontCascade, and update all the calls
+        to it.
+
+        Covered by existent tests.
+
+        * platform/graphics/FontCascade.cpp:
+        (WebCore::FontCascade::drawGlyphBuffer const):
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::drawGlyphs):
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/displaylists/DisplayListItems.cpp:
+        (WebCore::DisplayList::DrawGlyphs::apply const):
+        * rendering/mathml/MathOperator.cpp:
+        (WebCore::MathOperator::paintGlyph):
+        (WebCore::MathOperator::paint):
+        * rendering/mathml/RenderMathMLToken.cpp:
+        (WebCore::RenderMathMLToken::paint):
+
 2018-06-15  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/graphics/FontCascade.cpp

@@ -1431 +1431 @@
         if (nextFontData != fontData || nextOffset != offset) {
             if (shouldDrawIfLoading(*fontData, customFontNotReadyAction))
-                context.drawGlyphs(*this, *fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
+                context.drawGlyphs(*fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint, m_fontDescription.fontSmoothing());
 
             lastFrom = nextGlyph;
@@ -1445 +1445 @@
 
     if (shouldDrawIfLoading(*fontData, customFontNotReadyAction))
-        context.drawGlyphs(*this, *fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
+        context.drawGlyphs(*fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint, m_fontDescription.fontSmoothing());
     point.setX(nextX);
 }

trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

@@ -641 +641 @@
 }
 
-void GraphicsContext::drawGlyphs(const FontCascade& fontCascade, const Font& font, const GlyphBuffer& buffer, unsigned from, unsigned numGlyphs, const FloatPoint& point)
-{
-    if (paintingDisabled())
-        return;
-
-    if (m_impl) {
-        m_impl->drawGlyphs(font, buffer, from, numGlyphs, point, fontCascade.fontDescription().fontSmoothing());
-        return;
-    }
-
-    fontCascade.drawGlyphs(*this, font, buffer, from, numGlyphs, point, fontCascade.fontDescription().fontSmoothing());
+void GraphicsContext::drawGlyphs(const Font& font, const GlyphBuffer& buffer, unsigned from, unsigned numGlyphs, const FloatPoint& point, FontSmoothingMode fontSmoothingMode)
+{
+    if (paintingDisabled())
+        return;
+
+    if (m_impl) {
+        m_impl->drawGlyphs(font, buffer, from, numGlyphs, point, fontSmoothingMode);
+        return;
+    }
+
+    FontCascade::drawGlyphs(*this, font, buffer, from, numGlyphs, point, fontSmoothingMode);
 }
 

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -397 +397 @@
 
     float drawText(const FontCascade&, const TextRun&, const FloatPoint&, unsigned from = 0, std::optional<unsigned> to = std::nullopt);
-    void drawGlyphs(const FontCascade&, const Font&, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint&);
+    void drawGlyphs(const Font&, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint&, FontSmoothingMode);
     void drawEmphasisMarks(const FontCascade&, const TextRun&, const AtomicString& mark, const FloatPoint&, unsigned from = 0, std::optional<unsigned> to = std::nullopt);
     void drawBidiText(const FontCascade&, const TextRun&, const FloatPoint&, FontCascade::CustomFontNotReadyAction = FontCascade::DoNotPaintIfFontNotReady);

trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp

@@ -372 +372 @@
 void DrawGlyphs::apply(GraphicsContext& context) const
 {
-    FontCascade::drawGlyphs(context, m_font, generateGlyphBuffer(), 0, m_glyphs.size(), anchorPoint(), m_smoothingMode);
+    context.drawGlyphs(m_font, generateGlyphBuffer(), 0, m_glyphs.size(), anchorPoint(), m_smoothingMode);
 }
 

trunk/Source/WebCore/rendering/mathml/MathOperator.cpp

@@ -540 +540 @@
     GlyphBuffer buffer;
     buffer.add(data.glyph, data.font, advanceWidthForGlyph(data));
-    info.context().drawGlyphs(style.fontCascade(), *data.font, buffer, 0, 1, origin);
+    info.context().drawGlyphs(*data.font, buffer, 0, 1, origin, style.fontCascade().fontDescription().fontSmoothing());
 
     return glyphPaintRect;
@@ -747 +747 @@
     FloatRect glyphBounds = boundsForGlyph(glyphData);
     LayoutPoint operatorOrigin(operatorTopLeft.x(), operatorTopLeft.y() - glyphBounds.y());
-    paintInfo.context().drawGlyphs(style.fontCascade(), *glyphData.font, buffer, 0, 1, operatorOrigin);
+    paintInfo.context().drawGlyphs(*glyphData.font, buffer, 0, 1, operatorOrigin, style.fontCascade().fontDescription().fontSmoothing());
 }
 

trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.cpp

@@ -608 +608 @@
     buffer.add(mathVariantGlyph.glyph, mathVariantGlyph.font, mathVariantGlyph.font->widthForGlyph(mathVariantGlyph.glyph));
     LayoutUnit glyphAscent = static_cast<int>(lroundf(-mathVariantGlyph.font->boundsForGlyph(mathVariantGlyph.glyph).y()));
-    info.context().drawGlyphs(style().fontCascade(), *mathVariantGlyph.font, buffer, 0, 1, paintOffset + location() + LayoutPoint(0, glyphAscent));
+    info.context().drawGlyphs(*mathVariantGlyph.font, buffer, 0, 1, paintOffset + location() + LayoutPoint(0, glyphAscent), style().fontCascade().fontDescription().fontSmoothing());
 }