Diff
Modified: trunk/Source/WebCore/ChangeLog (193928 => 193929)
--- trunk/Source/WebCore/ChangeLog 2015-12-10 23:02:31 UTC (rev 193928)
+++ trunk/Source/WebCore/ChangeLog 2015-12-10 23:30:41 UTC (rev 193929)
@@ -1,3 +1,33 @@
+2015-12-10 Zalan Bujtas <za...@apple.com>
+
+ TextPainter: Add support for painting multiple text runs.
+ https://bugs.webkit.org/show_bug.cgi?id=152148
+
+ Reviewed by Simon Fraser.
+
+ This is in preparation for adding simple line layout as a client.
+
+ No change in functionality.
+
+ * rendering/InlineTextBox.cpp:
+ (WebCore::drawSkipInkUnderline): Decouple underline skipping intersection calculation and text painter.
+ (WebCore::InlineTextBox::paint):
+ (WebCore::InlineTextBox::paintDecoration):
+ * rendering/InlineTextBox.h:
+ * rendering/TextPainter.cpp:
+ (WebCore::TextPainter::TextPainter):
+ (WebCore::TextPainter::paintTextWithShadows):
+ (WebCore::TextPainter::paintTextAndEmphasisMarksIfNeeded):
+ (WebCore::TextPainter::paintText):
+ (WebCore::TextPainter::dashesForIntersectionsWithRect): Deleted.
+ * rendering/TextPainter.h:
+ (WebCore::TextPainter::setTextPaintStyle):
+ (WebCore::TextPainter::setSelectionPaintStyle):
+ (WebCore::TextPainter::setIsHorizontal):
+ (WebCore::TextPainter::setFont):
+ (WebCore::TextPainter::addEmphasis):
+ (WebCore::TextPainter::addTextShadow):
+
2015-12-10 Enrica Casucci <enr...@apple.com>
Change skin tone support for two emoji.
Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (193928 => 193929)
--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-12-10 23:02:31 UTC (rev 193928)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-12-10 23:30:41 UTC (rev 193929)
@@ -119,14 +119,14 @@
return result;
}
-static void drawSkipInkUnderline(TextPainter& textPainter, GraphicsContext& context, FloatPoint localOrigin, float underlineOffset, float width, bool isPrinting, bool doubleLines)
+static void drawSkipInkUnderline(GraphicsContext& context, const FontCascade& font, const TextRun& textRun, const FloatPoint& textOrigin, const FloatPoint& localOrigin,
+ float underlineOffset, float width, bool isPrinting, bool doubleLines)
{
FloatPoint adjustedLocalOrigin = localOrigin;
adjustedLocalOrigin.move(0, underlineOffset);
FloatRect underlineBoundingBox = context.computeLineBoundsForText(adjustedLocalOrigin, width, isPrinting);
- DashArray intersections = textPainter.dashesForIntersectionsWithRect(underlineBoundingBox);
+ DashArray intersections = font.dashesForIntersectionsWithRect(textRun, textOrigin, underlineBoundingBox);
DashArray a = translateIntersectionPointsToSkipInkBoundaries(intersections, underlineBoundingBox.height(), width);
-
ASSERT(!(a.size() % 2));
context.drawLinesForText(adjustedLocalOrigin, a, isPrinting, doubleLines);
}
@@ -612,16 +612,23 @@
else
textOrigin.setX(roundToDevicePixel(LayoutUnit(textOrigin.x()), renderer().document().deviceScaleFactor()));
- TextPainter textPainter(context, paintSelectedTextOnly, paintSelectedTextSeparately, font, selectionStart, selectionEnd, length, emphasisMark, combinedText, textRun, boxRect, textOrigin, emphasisMarkOffset, textShadow, selectionShadow, isHorizontal(), textPaintStyle, selectionPaintStyle);
- textPainter.paintText();
+ TextPainter textPainter(context);
+ textPainter.setFont(font);
+ textPainter.setTextPaintStyle(textPaintStyle);
+ textPainter.setSelectionPaintStyle(selectionPaintStyle);
+ textPainter.setIsHorizontal(isHorizontal());
+ textPainter.addTextShadow(textShadow, selectionShadow);
+ textPainter.addEmphasis(emphasisMark, emphasisMarkOffset, combinedText);
+ textPainter.paintText(textRun, length, boxRect, textOrigin, selectionStart, selectionEnd, paintSelectedTextOnly, paintSelectedTextSeparately);
+
// Paint decorations
TextDecoration textDecorations = lineStyle.textDecorationsInEffect();
if (textDecorations != TextDecorationNone && paintInfo.phase != PaintPhaseSelection) {
updateGraphicsContext(context, textPaintStyle);
if (combinedText)
context.concatCTM(rotation(boxRect, Clockwise));
- paintDecoration(context, boxOrigin, textDecorations, textShadow, textPainter);
+ paintDecoration(context, font, textRun, textOrigin, boxOrigin, textDecorations, textShadow);
if (combinedText)
context.concatCTM(rotation(boxRect, Counterclockwise));
}
@@ -894,12 +901,14 @@
context.strokePath(path);
}
-void InlineTextBox::paintDecoration(GraphicsContext& context, const FloatPoint& boxOrigin, TextDecoration decoration, const ShadowData* shadow, TextPainter& textPainter)
+void InlineTextBox::paintDecoration(GraphicsContext& context, const FontCascade& font, const TextRun& textRun, const FloatPoint& textOrigin, const FloatPoint& boxOrigin,
+ TextDecoration decoration, const ShadowData* shadow)
{
#if !ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
- UNUSED_PARAM(textPainter);
+ UNUSED_PARAM(font);
+ UNUSED_PARAM(textRun);
+ UNUSED_PARAM(textOrigin);
#endif
-
if (m_truncation == cFullTruncation)
return;
@@ -985,9 +994,8 @@
default:
#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
if ((lineStyle.textDecorationSkip() == TextDecorationSkipInk || lineStyle.textDecorationSkip() == TextDecorationSkipAuto) && isHorizontal()) {
- if (!context.paintingDisabled()) {
- drawSkipInkUnderline(textPainter, context, localOrigin, underlineOffset, width, isPrinting, underlineStyle == TextDecorationStyleDouble);
- }
+ if (!context.paintingDisabled())
+ drawSkipInkUnderline(context, font, textRun, textOrigin, localOrigin, underlineOffset, width, isPrinting, underlineStyle == TextDecorationStyleDouble);
} else
// FIXME: Need to support text-decoration-skip: none.
#endif // CSS3_TEXT_DECORATION_SKIP_INK
@@ -1008,7 +1016,7 @@
#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
if ((lineStyle.textDecorationSkip() == TextDecorationSkipInk || lineStyle.textDecorationSkip() == TextDecorationSkipAuto) && isHorizontal()) {
if (!context.paintingDisabled())
- drawSkipInkUnderline(textPainter, context, localOrigin, 0, width, isPrinting, overlineStyle == TextDecorationStyleDouble);
+ drawSkipInkUnderline(context, font, textRun, textOrigin, localOrigin, 0, width, isPrinting, overlineStyle == TextDecorationStyleDouble);
} else
// FIXME: Need to support text-decoration-skip: none.
#endif // CSS3_TEXT_DECORATION_SKIP_INK
Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (193928 => 193929)
--- trunk/Source/WebCore/rendering/InlineTextBox.h 2015-12-10 23:02:31 UTC (rev 193928)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2015-12-10 23:30:41 UTC (rev 193929)
@@ -159,7 +159,7 @@
void paintCompositionUnderline(GraphicsContext&, const FloatPoint& boxOrigin, const CompositionUnderline&);
private:
- void paintDecoration(GraphicsContext&, const FloatPoint& boxOrigin, TextDecoration, const ShadowData*, TextPainter&);
+ void paintDecoration(GraphicsContext&, const FontCascade&, const TextRun&, const FloatPoint& textOrigin, const FloatPoint& boxOrigin, TextDecoration, const ShadowData*);
void paintSelection(GraphicsContext&, const FloatPoint& boxOrigin, const RenderStyle&, const FontCascade&, Color textColor);
void paintDocumentMarker(GraphicsContext&, const FloatPoint& boxOrigin, RenderedDocumentMarker&, const RenderStyle&, const FontCascade&, bool grammar);
void paintTextMatchMarker(GraphicsContext&, const FloatPoint& boxOrigin, RenderedDocumentMarker&, const RenderStyle&, const FontCascade&);
Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (193928 => 193929)
--- trunk/Source/WebCore/rendering/TextPainter.cpp 2015-12-10 23:02:31 UTC (rev 193928)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp 2015-12-10 23:30:41 UTC (rev 193929)
@@ -26,7 +26,6 @@
#include "GraphicsContext.h"
#include "InlineTextBox.h"
#include "RenderCombineText.h"
-#include "TextPaintStyle.h"
#include <wtf/NeverDestroyed.h>
namespace WebCore {
@@ -79,28 +78,8 @@
m_context.clearShadow();
}
-TextPainter::TextPainter(GraphicsContext& context, bool paintSelectedTextOnly, bool paintSelectedTextSeparately, const FontCascade& font, int selectionStart,
- int selectionEnd, int length, const AtomicString& emphasisMark, RenderCombineText* combinedText, TextRun& textRun, FloatRect& boxRect,
- FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow, bool textBoxIsHorizontal,
- TextPaintStyle& textPaintStyle, TextPaintStyle& selectionPaintStyle)
+TextPainter::TextPainter(GraphicsContext& context)
: m_context(context)
- , m_textPaintStyle(textPaintStyle)
- , m_selectionPaintStyle(selectionPaintStyle)
- , m_textShadow(textShadow)
- , m_selectionShadow(selectionShadow)
- , m_paintSelectedTextOnly(paintSelectedTextOnly)
- , m_paintSelectedTextSeparately(paintSelectedTextSeparately)
- , m_font(font)
- , m_selectionStart(selectionStart)
- , m_selectionEnd(selectionEnd)
- , m_length(length)
- , m_emphasisMark(emphasisMark)
- , m_combinedText(combinedText)
- , m_textRun(textRun)
- , m_boxRect(boxRect)
- , m_textOrigin(textOrigin)
- , m_emphasisMarkOffset(emphasisMarkOffset)
- , m_textBoxIsHorizontal(textBoxIsHorizontal)
{
}
@@ -114,8 +93,8 @@
m_context.drawEmphasisMarks(font, textRun, emphasisMark, textOrigin + IntSize(0, emphasisMarkOffset), startOffset, endOffset);
}
-void TextPainter::paintTextWithShadows(const ShadowData* shadow, const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark,
- int emphasisMarkOffset, int startOffset, int endOffset, const FloatPoint& textOrigin, bool stroked)
+void TextPainter::paintTextWithShadows(const ShadowData* shadow, const FontCascade& font, const TextRun& textRun, const FloatRect& boxRect, const FloatPoint& textOrigin,
+ int startOffset, int endOffset, const AtomicString& emphasisMark, int emphasisMarkOffset, bool stroked)
{
if (!shadow) {
drawTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin, startOffset, endOffset);
@@ -128,7 +107,7 @@
if (!opaque)
m_context.setFillColor(Color::black);
while (shadow) {
- ShadowApplier shadowApplier(m_context, shadow, m_boxRect, lastShadowIterationShouldDrawText, opaque, m_textBoxIsHorizontal ? Horizontal : Vertical);
+ ShadowApplier shadowApplier(m_context, shadow, boxRect, lastShadowIterationShouldDrawText, opaque, m_textBoxIsHorizontal ? Horizontal : Vertical);
if (!shadowApplier.nothingToDraw())
drawTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin + shadowApplier.extraOffset(), startOffset, endOffset);
shadow = shadow->next();
@@ -141,59 +120,56 @@
}
}
-void TextPainter::paintTextAndEmphasisMarksIfNeeded(int startOffset, int endOffset, const TextPaintStyle& paintStyle, const ShadowData* shadow)
+void TextPainter::paintTextAndEmphasisMarksIfNeeded(const TextRun& textRun, const FloatRect& boxRect, const FloatPoint& textOrigin, int startOffset, int endOffset,
+ const TextPaintStyle& paintStyle, const ShadowData* shadow)
{
// FIXME: Truncate right-to-left text correctly.
- paintTextWithShadows(shadow, m_font, m_textRun, nullAtom, 0, startOffset, endOffset, m_textOrigin, paintStyle.strokeWidth > 0);
+ paintTextWithShadows(shadow, *m_font, textRun, boxRect, textOrigin, startOffset, endOffset, nullAtom, 0, paintStyle.strokeWidth > 0);
if (m_emphasisMark.isEmpty())
return;
- FloatPoint boxOrigin = m_boxRect.location();
+ FloatPoint boxOrigin = boxRect.location();
updateGraphicsContext(m_context, paintStyle, UseEmphasisMarkColor);
static NeverDestroyed<TextRun> objectReplacementCharacterTextRun(StringView(&objectReplacementCharacter, 1));
- TextRun& emphasisMarkTextRun = m_combinedText ? objectReplacementCharacterTextRun.get() : m_textRun;
- FloatPoint emphasisMarkTextOrigin = m_combinedText ? FloatPoint(boxOrigin.x() + m_boxRect.width() / 2, boxOrigin.y() + m_font.fontMetrics().ascent()) : m_textOrigin;
+ const TextRun& emphasisMarkTextRun = m_combinedText ? objectReplacementCharacterTextRun.get() : textRun;
+ FloatPoint emphasisMarkTextOrigin = m_combinedText ? FloatPoint(boxOrigin.x() + boxRect.width() / 2, boxOrigin.y() + m_font->fontMetrics().ascent()) : textOrigin;
if (m_combinedText)
- m_context.concatCTM(rotation(m_boxRect, Clockwise));
+ m_context.concatCTM(rotation(boxRect, Clockwise));
// FIXME: Truncate right-to-left text correctly.
- paintTextWithShadows(shadow, m_combinedText ? m_combinedText->originalFont() : m_font, emphasisMarkTextRun, m_emphasisMark, m_emphasisMarkOffset, startOffset, endOffset, emphasisMarkTextOrigin, paintStyle.strokeWidth > 0);
+ paintTextWithShadows(shadow, m_combinedText ? m_combinedText->originalFont() : *m_font, emphasisMarkTextRun, boxRect, emphasisMarkTextOrigin, startOffset, endOffset,
+ m_emphasisMark, m_emphasisMarkOffset, paintStyle.strokeWidth > 0);
if (m_combinedText)
- m_context.concatCTM(rotation(m_boxRect, Counterclockwise));
+ m_context.concatCTM(rotation(boxRect, Counterclockwise));
}
-void TextPainter::paintText()
+void TextPainter::paintText(const TextRun& textRun, int length, const FloatRect& boxRect, const FloatPoint& textOrigin, int selectionStart, int selectionEnd,
+ bool paintSelectedTextOnly, bool paintSelectedTextSeparately)
{
- if (!m_paintSelectedTextOnly) {
+ ASSERT(m_font);
+ if (!paintSelectedTextOnly) {
// For stroked painting, we have to change the text drawing mode. It's probably dangerous to leave that mutated as a side
// effect, so only when we know we're stroking, do a save/restore.
GraphicsContextStateSaver stateSaver(m_context, m_textPaintStyle.strokeWidth > 0);
updateGraphicsContext(m_context, m_textPaintStyle);
- if (m_paintSelectedTextSeparately) {
+ if (paintSelectedTextSeparately) {
// Paint the before and after selection parts.
- if (m_selectionStart > 0)
- paintTextAndEmphasisMarksIfNeeded(0, m_selectionStart, m_textPaintStyle, m_textShadow);
- if (m_selectionEnd < m_length)
- paintTextAndEmphasisMarksIfNeeded(m_selectionEnd, m_length, m_textPaintStyle, m_textShadow);
+ if (selectionStart > 0)
+ paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, 0, selectionStart, m_textPaintStyle, m_textShadow);
+ if (selectionEnd < length)
+ paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, selectionEnd, length, m_textPaintStyle, m_textShadow);
} else
- paintTextAndEmphasisMarksIfNeeded(0, m_length, m_textPaintStyle, m_textShadow);
+ paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, 0, length, m_textPaintStyle, m_textShadow);
}
// Paint only the text that is selected.
- if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_selectionStart < m_selectionEnd) {
+ if ((paintSelectedTextOnly || paintSelectedTextSeparately) && selectionStart < selectionEnd) {
GraphicsContextStateSaver stateSaver(m_context, m_selectionPaintStyle.strokeWidth > 0);
updateGraphicsContext(m_context, m_selectionPaintStyle);
- paintTextAndEmphasisMarksIfNeeded(m_selectionStart, m_selectionEnd, m_selectionPaintStyle, m_selectionShadow);
+ paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, selectionStart, selectionEnd, m_selectionPaintStyle, m_selectionShadow);
}
}
-#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
-DashArray TextPainter::dashesForIntersectionsWithRect(const FloatRect& lineExtents)
-{
- return m_font.dashesForIntersectionsWithRect(m_textRun, m_textOrigin, lineExtents);
-}
-#endif
-
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/TextPainter.h (193928 => 193929)
--- trunk/Source/WebCore/rendering/TextPainter.h 2015-12-10 23:02:31 UTC (rev 193928)
+++ trunk/Source/WebCore/rendering/TextPainter.h 2015-12-10 23:30:41 UTC (rev 193929)
@@ -24,9 +24,9 @@
#define TextPainter_h
#include "AffineTransform.h"
-#include "DashArray.h"
#include "RenderText.h"
#include "TextFlags.h"
+#include "TextPaintStyle.h"
namespace WebCore {
@@ -44,43 +44,51 @@
class TextPainter {
public:
- TextPainter(GraphicsContext&, bool paintSelectedTextOnly, bool paintSelectedTextSeparately, const FontCascade&,
- int selectionStart, int selectionEnd, int length, const AtomicString& emphasisMark, RenderCombineText*,
- TextRun&, FloatRect& boxRect, FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow,
- bool textBoxIsHorizontal, TextPaintStyle& nonSelectionPaintStyle, TextPaintStyle& selectionPaintStyle);
+ TextPainter(GraphicsContext&);
- void paintText();
-#if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
- DashArray dashesForIntersectionsWithRect(const FloatRect& lineExtents);
-#endif
+ void setTextPaintStyle(const TextPaintStyle& textPaintStyle) { m_textPaintStyle = textPaintStyle; }
+ void setSelectionPaintStyle(const TextPaintStyle& selectionPaintStyle) { m_selectionPaintStyle = selectionPaintStyle; }
+ void setIsHorizontal(bool isHorizontal) { m_textBoxIsHorizontal = isHorizontal; }
+ void setFont(const FontCascade& font) { m_font = &font; }
+ void addEmphasis(const AtomicString& emphasisMark, int emphasisMarkOffset, RenderCombineText*);
+ void addTextShadow(const ShadowData* textShadow, const ShadowData* selectionShadow);
+ void paintText(const TextRun&, int length, const FloatRect& boxRect, const FloatPoint& textOrigin,
+ int selectionStart, int selectionEnd, bool paintSelectedTextOnly, bool paintSelectedTextSeparately);
+
private:
void drawTextOrEmphasisMarks(const FontCascade&, const TextRun&, const AtomicString& emphasisMark, int emphasisMarkOffset,
const FloatPoint& textOrigin, int startOffset, int endOffset);
- void paintTextWithShadows(const ShadowData*, const FontCascade&, const TextRun&, const AtomicString& emphasisMark, int emphasisMarkOffset,
- int startOffset, int endOffset, const FloatPoint& textOrigin, bool stroked);
- void paintTextAndEmphasisMarksIfNeeded(int startOffset, int endOffset, const TextPaintStyle&, const ShadowData*);
+ void paintTextWithShadows(const ShadowData*, const FontCascade&, const TextRun&, const FloatRect& boxRect, const FloatPoint& textOrigin,
+ int startOffset, int endOffset, const AtomicString& emphasisMark, int emphasisMarkOffset, bool stroked);
+ void paintTextAndEmphasisMarksIfNeeded(const TextRun&, const FloatRect& boxRect, const FloatPoint& textOrigin, int startOffset, int endOffset,
+ const TextPaintStyle&, const ShadowData*);
GraphicsContext& m_context;
- TextPaintStyle& m_textPaintStyle;
- TextPaintStyle& m_selectionPaintStyle;
- const ShadowData* m_textShadow;
- const ShadowData* m_selectionShadow;
- bool m_paintSelectedTextOnly;
- bool m_paintSelectedTextSeparately;
- const FontCascade& m_font;
- int m_selectionStart;
- int m_selectionEnd;
- int m_length;
- const AtomicString& m_emphasisMark;
- RenderCombineText* m_combinedText;
- TextRun& m_textRun;
- FloatRect m_boxRect;
- FloatPoint m_textOrigin;
- int m_emphasisMarkOffset;
- bool m_textBoxIsHorizontal;
+ const FontCascade* m_font { nullptr };
+ TextPaintStyle m_textPaintStyle;
+ TextPaintStyle m_selectionPaintStyle;
+ const ShadowData* m_textShadow { nullptr };
+ const ShadowData* m_selectionShadow { nullptr };
+ AtomicString m_emphasisMark;
+ RenderCombineText* m_combinedText { nullptr };
+ int m_emphasisMarkOffset { 0 };
+ bool m_textBoxIsHorizontal { true };
};
+inline void TextPainter::addEmphasis(const AtomicString& emphasisMark, int emphasisMarkOffset, RenderCombineText* combinedText)
+{
+ m_emphasisMark = emphasisMark;
+ m_emphasisMarkOffset = emphasisMarkOffset;
+ m_combinedText = combinedText;
+}
+
+inline void TextPainter::addTextShadow(const ShadowData* textShadow, const ShadowData* selectionShadow)
+{
+ m_textShadow = textShadow;
+ m_selectionShadow = selectionShadow;
+}
+
class ShadowApplier {
public:
ShadowApplier(GraphicsContext&, const ShadowData*, const FloatRect& textRect, bool lastShadowIterationShouldDrawText = true, bool opaque = false, FontOrientation = Horizontal);
