From d41a50a133ba99d6236cd44d1c33407ed14b5ca5 Mon Sep 17 00:00:00 2001 From: "dbates@webkit.org" Date: Mon, 21 Aug 2017 23:21:15 +0000 Subject: [PATCH] Cleanup TextPainter https://bugs.webkit.org/show_bug.cgi?id=175782 Reviewed by Myles C. Maxfield. Remove redundant mention of "text" in the name of TextPainter member functions, add separate setters for selection and non-selection shadows, and do some other minor cleanups. * rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::paint): Update code for renamed functions. * rendering/SimpleLineLayoutFunctions.cpp: (WebCore::SimpleLineLayout::paintFlow): Ditto. * rendering/TextPainter.cpp: Include ShadowData.h. (WebCore::ShadowApplier::ShadowApplier): Use C++11 brace-initialization syntax. (WebCore::ShadowApplier::isLastShadowIteration): Moved from TextPainter.h. (WebCore::ShadowApplier::shadowIsCompletelyCoveredByText): Ditto. (WebCore::TextPainter::paintTextOrEmphasisMarks): Renamed; formerly named drawTextOrEmphasisMarks. (WebCore::TextPainter::paintTextWithShadows): Update code for renamed functions. (WebCore::TextPainter::paintRange): Renamed; formerly named paintTextInRange. (WebCore::TextPainter::paint): Renamed; formerly named paintText. (WebCore::TextPainter::drawTextOrEmphasisMarks): Renamed to paintTextOrEmphasisMarks() to match the naming convention of all the other paint functions in this class. (WebCore::TextPainter::paintTextInRange): Renamed to paintRange. (WebCore::TextPainter::paintText): Renamed to paint. * rendering/TextPainter.h: Forward declare ShadowData. (WebCore::TextPainter::setStyle): Renamed; formerly named setTextPaintStyle. (WebCore::TextPainter::setSelectionStyle): Renamed; formerly named setSelectionPaintStyle. (WebCore::TextPainter::setShadow): Added. (WebCore::TextPainter::setSelectionShadow): Added. (WebCore::TextPainter::setEmphasisMark): Renamed; formerly named addEmphasis. (WebCore::TextPainter::setTextPaintStyle): Renamed to setStyle. (WebCore::TextPainter::setSelectionPaintStyle): Renamed to setSelectionStyle. (WebCore::TextPainter::addEmphasis): Renamed to setEmphasisMark. (WebCore::TextPainter::addTextShadow): Split functionality into setShadow and setSelectionShadow. (WebCore::ShadowApplier::isLastShadowIteration): Moved to TextPainter.cpp. (WebCore::ShadowApplier::shadowIsCompletelyCoveredByText): Ditto. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@220988 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 39 ++++++++++++ Source/WebCore/rendering/InlineTextBox.cpp | 17 +++--- .../rendering/SimpleLineLayoutFunctions.cpp | 6 +- Source/WebCore/rendering/TextPainter.cpp | 59 +++++++++++-------- Source/WebCore/rendering/TextPainter.h | 53 +++++++---------- 5 files changed, 107 insertions(+), 67 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 9fef19ecae72..60340a2094ae 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,42 @@ +2017-08-21 Daniel Bates + + Cleanup TextPainter + https://bugs.webkit.org/show_bug.cgi?id=175782 + + Reviewed by Myles C. Maxfield. + + Remove redundant mention of "text" in the name of TextPainter member functions, add separate + setters for selection and non-selection shadows, and do some other minor cleanups. + + * rendering/InlineTextBox.cpp: + (WebCore::InlineTextBox::paint): Update code for renamed functions. + * rendering/SimpleLineLayoutFunctions.cpp: + (WebCore::SimpleLineLayout::paintFlow): Ditto. + * rendering/TextPainter.cpp: Include ShadowData.h. + (WebCore::ShadowApplier::ShadowApplier): Use C++11 brace-initialization syntax. + (WebCore::ShadowApplier::isLastShadowIteration): Moved from TextPainter.h. + (WebCore::ShadowApplier::shadowIsCompletelyCoveredByText): Ditto. + (WebCore::TextPainter::paintTextOrEmphasisMarks): Renamed; formerly named drawTextOrEmphasisMarks. + (WebCore::TextPainter::paintTextWithShadows): Update code for renamed functions. + (WebCore::TextPainter::paintRange): Renamed; formerly named paintTextInRange. + (WebCore::TextPainter::paint): Renamed; formerly named paintText. + (WebCore::TextPainter::drawTextOrEmphasisMarks): Renamed to paintTextOrEmphasisMarks() to match + the naming convention of all the other paint functions in this class. + (WebCore::TextPainter::paintTextInRange): Renamed to paintRange. + (WebCore::TextPainter::paintText): Renamed to paint. + * rendering/TextPainter.h: Forward declare ShadowData. + (WebCore::TextPainter::setStyle): Renamed; formerly named setTextPaintStyle. + (WebCore::TextPainter::setSelectionStyle): Renamed; formerly named setSelectionPaintStyle. + (WebCore::TextPainter::setShadow): Added. + (WebCore::TextPainter::setSelectionShadow): Added. + (WebCore::TextPainter::setEmphasisMark): Renamed; formerly named addEmphasis. + (WebCore::TextPainter::setTextPaintStyle): Renamed to setStyle. + (WebCore::TextPainter::setSelectionPaintStyle): Renamed to setSelectionStyle. + (WebCore::TextPainter::addEmphasis): Renamed to setEmphasisMark. + (WebCore::TextPainter::addTextShadow): Split functionality into setShadow and setSelectionShadow. + (WebCore::ShadowApplier::isLastShadowIteration): Moved to TextPainter.cpp. + (WebCore::ShadowApplier::shadowIsCompletelyCoveredByText): Ditto. + 2017-08-21 Myles C. Maxfield Addressing post-review comments after r220725 diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp index d76fe097ca62..24774c560cc7 100644 --- a/Source/WebCore/rendering/InlineTextBox.cpp +++ b/Source/WebCore/rendering/InlineTextBox.cpp @@ -547,11 +547,12 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, TextPainter textPainter(context); textPainter.setFont(font); - textPainter.setTextPaintStyle(textPaintStyle); - textPainter.setSelectionPaintStyle(selectionPaintStyle); + textPainter.setStyle(textPaintStyle); + textPainter.setSelectionStyle(selectionPaintStyle); textPainter.setIsHorizontal(isHorizontal()); - textPainter.addTextShadow(textShadow, selectionShadow); - textPainter.addEmphasis(emphasisMark, emphasisMarkOffset, combinedText); + textPainter.setShadow(textShadow); + textPainter.setSelectionShadow(selectionShadow); + textPainter.setEmphasisMark(emphasisMark, emphasisMarkOffset, combinedText); auto draggedContentRanges = renderer().draggedContentRangesBetweenOffsets(m_start, m_start + m_len); if (!draggedContentRanges.isEmpty() && !paintSelectedTextOnly && !paintNonSelectedTextOnly) { @@ -564,19 +565,19 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, currentEnd = std::min(draggedContentRanges[index].second - m_start, length); if (previousEnd < currentStart) - textPainter.paintTextInRange(textRun, boxRect, textOrigin, previousEnd, currentStart); + textPainter.paintRange(textRun, boxRect, textOrigin, previousEnd, currentStart); if (currentStart < currentEnd) { context.save(); context.setAlpha(0.25); - textPainter.paintTextInRange(textRun, boxRect, textOrigin, currentStart, currentEnd); + textPainter.paintRange(textRun, boxRect, textOrigin, currentStart, currentEnd); context.restore(); } } if (currentEnd < length) - textPainter.paintTextInRange(textRun, boxRect, textOrigin, currentEnd, length); + textPainter.paintRange(textRun, boxRect, textOrigin, currentEnd, length); } else - textPainter.paintText(textRun, length, boxRect, textOrigin, selectionStart, selectionEnd, paintSelectedTextOnly, paintSelectedTextSeparately, paintNonSelectedTextOnly); + textPainter.paint(textRun, length, boxRect, textOrigin, selectionStart, selectionEnd, paintSelectedTextOnly, paintSelectedTextSeparately, paintNonSelectedTextOnly); // Paint decorations TextDecoration textDecorations = lineStyle.textDecorationsInEffect(); diff --git a/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp b/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp index 40f4753abebe..06b61cc7565f 100644 --- a/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp +++ b/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp @@ -81,12 +81,12 @@ void paintFlow(const RenderBlockFlow& flow, const Layout& layout, PaintInfo& pai TextPainter textPainter(paintInfo.context()); textPainter.setFont(style.fontCascade()); - textPainter.setTextPaintStyle(computeTextPaintStyle(flow.frame(), style, paintInfo)); + textPainter.setStyle(computeTextPaintStyle(flow.frame(), style, paintInfo)); std::unique_ptr debugShadow = nullptr; if (flow.settings().simpleLineLayoutDebugBordersEnabled()) { debugShadow = std::make_unique(IntPoint(0, 0), 10, 20, ShadowStyle::Normal, true, Color(0, 255, 0, 200)); - textPainter.addTextShadow(debugShadow.get(), nullptr); + textPainter.setShadow(debugShadow.get()); } std::optional textDecorationPainter; @@ -120,7 +120,7 @@ void paintFlow(const RenderBlockFlow& flow, const Layout& layout, PaintInfo& pai TextRun textRun(run.hasHyphen() ? textWithHyphen : run.text(), 0, run.expansion(), run.expansionBehavior()); textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize()); FloatPoint textOrigin = FloatPoint(rect.x() + paintOffset.x(), roundToDevicePixel(run.baselinePosition() + paintOffset.y(), deviceScaleFactor)); - textPainter.paintText(textRun, textRun.length(), rect, textOrigin); + textPainter.paint(textRun, textRun.length(), rect, textOrigin); if (textDecorationPainter) { textDecorationPainter->setWidth(rect.width()); textDecorationPainter->paintTextDecoration(textRun, textOrigin, rect.location() + paintOffset); diff --git a/Source/WebCore/rendering/TextPainter.cpp b/Source/WebCore/rendering/TextPainter.cpp index 219177f6f6c2..60e920eaf7ed 100644 --- a/Source/WebCore/rendering/TextPainter.cpp +++ b/Source/WebCore/rendering/TextPainter.cpp @@ -1,7 +1,7 @@ /* * (C) 1999 Lars Knoll (knoll@kde.org) * (C) 2000 Dirk Mueller (mueller@kde.org) - * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. + * Copyright (C) 2004-2017 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,17 +26,18 @@ #include "GraphicsContext.h" #include "InlineTextBox.h" #include "RenderCombineText.h" +#include "ShadowData.h" #include namespace WebCore { ShadowApplier::ShadowApplier(GraphicsContext& context, const ShadowData* shadow, const FloatRect& textRect, bool lastShadowIterationShouldDrawText, bool opaque, FontOrientation orientation) - : m_context(context) - , m_shadow(shadow) - , m_onlyDrawsShadow(!isLastShadowIteration() || !lastShadowIterationShouldDrawText) - , m_avoidDrawingShadow(shadowIsCompletelyCoveredByText(opaque)) - , m_nothingToDraw(shadow && m_avoidDrawingShadow && m_onlyDrawsShadow) - , m_didSaveContext(false) + : m_context { context } + , m_shadow { shadow } + , m_onlyDrawsShadow { !isLastShadowIteration() || !lastShadowIterationShouldDrawText } + , m_avoidDrawingShadow { shadowIsCompletelyCoveredByText(opaque) } + , m_nothingToDraw { shadow && m_avoidDrawingShadow && m_onlyDrawsShadow } + , m_didSaveContext { false } { if (!shadow || m_nothingToDraw) { m_shadow = nullptr; @@ -68,6 +69,16 @@ ShadowApplier::ShadowApplier(GraphicsContext& context, const ShadowData* shadow, context.setShadow(shadowOffset, shadowRadius, shadowColor); } +inline bool ShadowApplier::isLastShadowIteration() +{ + return m_shadow && !m_shadow->next(); +} + +inline bool ShadowApplier::shadowIsCompletelyCoveredByText(bool textIsOpaque) +{ + return textIsOpaque && m_shadow && m_shadow->location().isZero() && !m_shadow->radius(); +} + ShadowApplier::~ShadowApplier() { if (!m_shadow) @@ -83,7 +94,7 @@ TextPainter::TextPainter(GraphicsContext& context) { } -void TextPainter::drawTextOrEmphasisMarks(const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark, +void TextPainter::paintTextOrEmphasisMarks(const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark, float emphasisMarkOffset, const FloatPoint& textOrigin, unsigned startOffset, unsigned endOffset) { ASSERT(startOffset < endOffset); @@ -97,7 +108,7 @@ void TextPainter::paintTextWithShadows(const ShadowData* shadow, const FontCasca unsigned startOffset, unsigned endOffset, const AtomicString& emphasisMark, float emphasisMarkOffset, bool stroked) { if (!shadow) { - drawTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin, startOffset, endOffset); + paintTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin, startOffset, endOffset); return; } @@ -109,14 +120,14 @@ void TextPainter::paintTextWithShadows(const ShadowData* shadow, const FontCasca while (shadow) { 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); + paintTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin + shadowApplier.extraOffset(), startOffset, endOffset); shadow = shadow->next(); } if (!lastShadowIterationShouldDrawText) { if (!opaque) m_context.setFillColor(fillColor); - drawTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin, startOffset, endOffset); + paintTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin, startOffset, endOffset); } } @@ -169,34 +180,34 @@ void TextPainter::paintTextAndEmphasisMarksIfNeeded(const TextRun& textRun, cons m_context.concatCTM(rotation(boxRect, Counterclockwise)); } -void TextPainter::paintTextInRange(const TextRun& textRun, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned start, unsigned end) +void TextPainter::paintRange(const TextRun& textRun, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned start, unsigned end) { ASSERT(m_font); ASSERT(start < end); - GraphicsContextStateSaver stateSaver(m_context, m_textPaintStyle.strokeWidth > 0); - updateGraphicsContext(m_context, m_textPaintStyle); - paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, start, end, m_textPaintStyle, m_textShadow); + GraphicsContextStateSaver stateSaver(m_context, m_style.strokeWidth > 0); + updateGraphicsContext(m_context, m_style); + paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, start, end, m_style, m_shadow); } -void TextPainter::paintText(const TextRun& textRun, unsigned length, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned selectionStart, unsigned selectionEnd, +void TextPainter::paint(const TextRun& textRun, unsigned length, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned selectionStart, unsigned selectionEnd, bool paintSelectedTextOnly, bool paintSelectedTextSeparately, bool paintNonSelectedTextOnly) { 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); + GraphicsContextStateSaver stateSaver(m_context, m_style.strokeWidth > 0); + updateGraphicsContext(m_context, m_style); bool fullPaint = !paintSelectedTextSeparately || selectionEnd <= selectionStart; if (fullPaint) - paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, 0, length, m_textPaintStyle, m_textShadow); + paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, 0, length, m_style, m_shadow); else { // Paint the before and after selection parts. if (selectionStart > 0) - paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, 0, selectionStart, m_textPaintStyle, m_textShadow); + paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, 0, selectionStart, m_style, m_shadow); if (selectionEnd < length) - paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, selectionEnd, length, m_textPaintStyle, m_textShadow); + paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, selectionEnd, length, m_style, m_shadow); } } @@ -205,9 +216,9 @@ void TextPainter::paintText(const TextRun& textRun, unsigned length, const Float // Paint only the text that is selected. if ((paintSelectedTextOnly || paintSelectedTextSeparately) && selectionStart < selectionEnd) { - GraphicsContextStateSaver stateSaver(m_context, m_selectionPaintStyle.strokeWidth > 0); - updateGraphicsContext(m_context, m_selectionPaintStyle); - paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, selectionStart, selectionEnd, m_selectionPaintStyle, m_selectionShadow); + GraphicsContextStateSaver stateSaver(m_context, m_selectionStyle.strokeWidth > 0); + updateGraphicsContext(m_context, m_selectionStyle); + paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, selectionStart, selectionEnd, m_selectionStyle, m_selectionShadow); } } diff --git a/Source/WebCore/rendering/TextPainter.h b/Source/WebCore/rendering/TextPainter.h index abd8b476ec05..3b81473cc829 100644 --- a/Source/WebCore/rendering/TextPainter.h +++ b/Source/WebCore/rendering/TextPainter.h @@ -1,7 +1,7 @@ /* * (C) 1999 Lars Knoll (knoll@kde.org) * (C) 2000 Dirk Mueller (mueller@kde.org) - * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. + * Copyright (C) 2004-2017 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,7 +24,6 @@ #include "AffineTransform.h" #include "FloatRect.h" -#include "ShadowData.h" #include "TextFlags.h" #include "TextPaintStyle.h" #include @@ -33,6 +32,7 @@ namespace WebCore { class FontCascade; class RenderCombineText; +class ShadowData; class TextRun; struct TextPaintStyle; @@ -49,19 +49,24 @@ class TextPainter { public: TextPainter(GraphicsContext&); - void setTextPaintStyle(const TextPaintStyle& textPaintStyle) { m_textPaintStyle = textPaintStyle; } - void setSelectionPaintStyle(const TextPaintStyle& selectionPaintStyle) { m_selectionPaintStyle = selectionPaintStyle; } - void setIsHorizontal(bool isHorizontal) { m_textBoxIsHorizontal = isHorizontal; } + void setStyle(const TextPaintStyle& textPaintStyle) { m_style = textPaintStyle; } + void setSelectionStyle(const TextPaintStyle& selectionPaintStyle) { m_selectionStyle = selectionPaintStyle; } + + void setShadow(const ShadowData* shadow) { m_shadow = shadow; } + void setSelectionShadow(const ShadowData* selectionShadow) { m_selectionShadow = selectionShadow; } + void setFont(const FontCascade& font) { m_font = &font; } - void addEmphasis(const AtomicString& emphasisMark, float emphasisMarkOffset, RenderCombineText*); - void addTextShadow(const ShadowData* textShadow, const ShadowData* selectionShadow); - void paintTextInRange(const TextRun&, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned start, unsigned end); - void paintText(const TextRun&, unsigned length, const FloatRect& boxRect, const FloatPoint& textOrigin, + void setIsHorizontal(bool isHorizontal) { m_textBoxIsHorizontal = isHorizontal; } + + void setEmphasisMark(const AtomicString& mark, float offset, RenderCombineText*); + + void paintRange(const TextRun&, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned start, unsigned end); + void paint(const TextRun&, unsigned length, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned selectionStart = 0, unsigned selectionEnd = 0, bool paintSelectedTextOnly = false, bool paintSelectedTextSeparately = false, bool paintNonSelectedTextOnly = false); private: - void drawTextOrEmphasisMarks(const FontCascade&, const TextRun&, const AtomicString& emphasisMark, float emphasisMarkOffset, + void paintTextOrEmphasisMarks(const FontCascade&, const TextRun&, const AtomicString& emphasisMark, float emphasisMarkOffset, const FloatPoint& textOrigin, unsigned startOffset, unsigned endOffset); void paintTextWithShadows(const ShadowData*, const FontCascade&, const TextRun&, const FloatRect& boxRect, const FloatPoint& textOrigin, unsigned startOffset, unsigned endOffset, const AtomicString& emphasisMark, float emphasisMarkOffset, bool stroked); @@ -70,9 +75,9 @@ private: GraphicsContext& m_context; const FontCascade* m_font { nullptr }; - TextPaintStyle m_textPaintStyle; - TextPaintStyle m_selectionPaintStyle; - const ShadowData* m_textShadow { nullptr }; + TextPaintStyle m_style; + TextPaintStyle m_selectionStyle; + const ShadowData* m_shadow { nullptr }; const ShadowData* m_selectionShadow { nullptr }; AtomicString m_emphasisMark; RenderCombineText* m_combinedText { nullptr }; @@ -80,19 +85,13 @@ private: bool m_textBoxIsHorizontal { true }; }; -inline void TextPainter::addEmphasis(const AtomicString& emphasisMark, float emphasisMarkOffset, RenderCombineText* combinedText) +inline void TextPainter::setEmphasisMark(const AtomicString& mark, float offset, RenderCombineText* combinedText) { - m_emphasisMark = emphasisMark; - m_emphasisMarkOffset = emphasisMarkOffset; + m_emphasisMark = mark; + m_emphasisMarkOffset = offset; 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); @@ -114,14 +113,4 @@ private: bool m_didSaveContext : 1; }; -inline bool ShadowApplier::isLastShadowIteration() -{ - return m_shadow && !m_shadow->next(); -} - -inline bool ShadowApplier::shadowIsCompletelyCoveredByText(bool textIsOpaque) -{ - return textIsOpaque && m_shadow && m_shadow->location() == IntPoint() && !m_shadow->radius(); -} - } // namespace WebCore -- 2.36.0