| Index: Source/core/paint/TextPainter.h
|
| diff --git a/Source/core/paint/TextPainter.h b/Source/core/paint/TextPainter.h
|
| index b84f97e7cd50857aa32e14b050f7dde1a29edf3a..1cee63d22c02cb68debef04b9d79e035457f8cf7 100644
|
| --- a/Source/core/paint/TextPainter.h
|
| +++ b/Source/core/paint/TextPainter.h
|
| @@ -19,7 +19,7 @@ namespace blink {
|
| class Font;
|
| class GraphicsContext;
|
| class GraphicsContextStateSaver;
|
| -class RenderCombineText;
|
| +class LayoutTextCombine;
|
| class LayoutObject;
|
| class LayoutStyle;
|
| class ShadowList;
|
| @@ -34,7 +34,7 @@ public:
|
| ~TextPainter();
|
|
|
| void setEmphasisMark(const AtomicString&, TextEmphasisPosition);
|
| - void setCombinedText(RenderCombineText* combinedText) { m_combinedText = combinedText; }
|
| + void setCombinedText(LayoutTextCombine* combinedText) { m_combinedText = combinedText; }
|
|
|
| static void updateGraphicsContext(GraphicsContext*, const Style&, bool horizontal, GraphicsContextStateSaver&);
|
|
|
| @@ -87,7 +87,7 @@ private:
|
| bool m_horizontal;
|
| AtomicString m_emphasisMark;
|
| int m_emphasisMarkOffset;
|
| - RenderCombineText* m_combinedText;
|
| + LayoutTextCombine* m_combinedText;
|
| };
|
|
|
| inline AffineTransform TextPainter::rotation(const FloatRectWillBeLayoutRect& boxRect, RotationDirection rotationDirection)
|
|
|