| Index: Source/core/paint/InlineTextBoxPainter.h
|
| diff --git a/Source/core/paint/InlineTextBoxPainter.h b/Source/core/paint/InlineTextBoxPainter.h
|
| index bae5e23cba411569547b0a213b1799471ae021dd..5d545933a5aaa1602dd8d384ab39cab9cac1aca7 100644
|
| --- a/Source/core/paint/InlineTextBoxPainter.h
|
| +++ b/Source/core/paint/InlineTextBoxPainter.h
|
| @@ -5,7 +5,7 @@
|
| #ifndef InlineTextBoxPainter_h
|
| #define InlineTextBoxPainter_h
|
|
|
| -#include "core/layout/style/LayoutStyleConstants.h"
|
| +#include "core/layout/style/ComputedStyleConstants.h"
|
|
|
| namespace blink {
|
|
|
| @@ -20,7 +20,7 @@ class Font;
|
| class GraphicsContext;
|
| class InlineTextBox;
|
| class LayoutPoint;
|
| -class LayoutStyle;
|
| +class ComputedStyle;
|
| class LayoutTextCombine;
|
|
|
| class InlineTextBoxPainter {
|
| @@ -28,19 +28,19 @@ public:
|
| InlineTextBoxPainter(InlineTextBox& inlineTextBox) : m_inlineTextBox(inlineTextBox) { }
|
|
|
| void paint(const PaintInfo&, const LayoutPoint&);
|
| - void paintDocumentMarkers(GraphicsContext*, const FloatPoint& boxOrigin, const LayoutStyle&, const Font&, bool background);
|
| - void paintDocumentMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, const LayoutStyle&, const Font&, bool grammar);
|
| - void paintTextMatchMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, const LayoutStyle&, const Font&);
|
| + void paintDocumentMarkers(GraphicsContext*, const FloatPoint& boxOrigin, const ComputedStyle&, const Font&, bool background);
|
| + void paintDocumentMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&, bool grammar);
|
| + void paintTextMatchMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&);
|
|
|
| static void removeFromTextBlobCache(InlineTextBox&);
|
|
|
| private:
|
| enum class PaintOptions { Normal, CombinedText };
|
|
|
| - void paintCompositionBackgrounds(GraphicsContext*, const FloatPoint& boxOrigin, const LayoutStyle&, const Font&, bool useCustomUnderlines);
|
| - void paintSingleCompositionBackgroundRun(GraphicsContext*, const FloatPoint& boxOrigin, const LayoutStyle&, const Font&, Color backgroundColor, int startPos, int endPos);
|
| + void paintCompositionBackgrounds(GraphicsContext*, const FloatPoint& boxOrigin, const ComputedStyle&, const Font&, bool useCustomUnderlines);
|
| + void paintSingleCompositionBackgroundRun(GraphicsContext*, const FloatPoint& boxOrigin, const ComputedStyle&, const Font&, Color backgroundColor, int startPos, int endPos);
|
| template <PaintOptions>
|
| - void paintSelection(GraphicsContext*, const FloatRect& boxRect, const LayoutStyle&, const Font&, Color textColor, LayoutTextCombine* = nullptr);
|
| + void paintSelection(GraphicsContext*, const FloatRect& boxRect, const ComputedStyle&, const Font&, Color textColor, LayoutTextCombine* = nullptr);
|
| void paintDecoration(GraphicsContext*, const FloatPoint& boxOrigin, TextDecoration);
|
| void paintCompositionUnderline(GraphicsContext*, const FloatPoint& boxOrigin, const CompositionUnderline&);
|
| unsigned underlinePaintStart(const CompositionUnderline&);
|
|
|