| Index: Source/core/layout/line/InlineTextBox.h
|
| diff --git a/Source/core/layout/line/InlineTextBox.h b/Source/core/layout/line/InlineTextBox.h
|
| index bbc8cd038b285aba84b261f129f461aa2b5cf732..d7db103410a7dd6d21499a55cb62fb45171dcfdb 100644
|
| --- a/Source/core/layout/line/InlineTextBox.h
|
| +++ b/Source/core/layout/line/InlineTextBox.h
|
| @@ -80,7 +80,7 @@ public:
|
| virtual int baselinePosition(FontBaseline) const override final;
|
| virtual LayoutUnit lineHeight() const override final;
|
|
|
| - bool getEmphasisMarkPosition(const LayoutStyle&, TextEmphasisPosition&) const;
|
| + bool getEmphasisMarkPosition(const ComputedStyle&, TextEmphasisPosition&) const;
|
|
|
| LayoutRect logicalOverflowRect() const;
|
| void setLogicalOverflowRect(const LayoutRect&);
|
| @@ -88,8 +88,8 @@ public:
|
| LayoutUnit logicalBottomVisualOverflow() const { return logicalOverflowRect().maxY(); }
|
|
|
| // charactersWithHyphen, if provided, must not be destroyed before the TextRun.
|
| - TextRun constructTextRun(const LayoutStyle&, const Font&, StringBuilder* charactersWithHyphen = 0) const;
|
| - TextRun constructTextRun(const LayoutStyle&, const Font&, StringView, int maximumLength, StringBuilder* charactersWithHyphen = 0) const;
|
| + TextRun constructTextRun(const ComputedStyle&, const Font&, StringBuilder* charactersWithHyphen = 0) const;
|
| + TextRun constructTextRun(const ComputedStyle&, const Font&, StringView, int maximumLength, StringBuilder* charactersWithHyphen = 0) const;
|
|
|
| #ifndef NDEBUG
|
| virtual void showBox(int = 0) const override;
|
| @@ -100,7 +100,7 @@ public:
|
| String text() const;
|
|
|
| public:
|
| - TextRun constructTextRunForInspector(const LayoutStyle&, const Font&) const;
|
| + TextRun constructTextRunForInspector(const ComputedStyle&, const Font&) const;
|
| virtual FloatRectWillBeLayoutRect calculateBoundaries() const override { return FloatRectWillBeLayoutRect(x(), y(), width(), height()); }
|
|
|
| virtual LayoutRect localSelectionRect(int startPos, int endPos);
|
| @@ -108,8 +108,8 @@ public:
|
| void selectionStartEnd(int& sPos, int& ePos) const;
|
|
|
| // These functions both paint markers and update the DocumentMarker's renderedRect.
|
| - virtual void paintDocumentMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint& boxOrigin, DocumentMarker*, const LayoutStyle&, const Font&, bool grammar);
|
| - virtual void paintTextMatchMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint& boxOrigin, DocumentMarker*, const LayoutStyle&, const Font&);
|
| + virtual void paintDocumentMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&, bool grammar);
|
| + virtual void paintTextMatchMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&);
|
|
|
| protected:
|
| virtual void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
|
|
|