| Index: third_party/WebKit/Source/core/paint/TextPainter.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/TextPainter.cpp b/third_party/WebKit/Source/core/paint/TextPainter.cpp
|
| index 6529fb43ec220d404436a3ac8e003f49b451d959..d4d942d6c1577d9b3176ba6a2e5ef59ebef76917 100644
|
| --- a/third_party/WebKit/Source/core/paint/TextPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/TextPainter.cpp
|
| @@ -62,18 +62,17 @@ void TextPainter::setEmphasisMark(const AtomicString& emphasisMark,
|
| void TextPainter::paint(unsigned startOffset,
|
| unsigned endOffset,
|
| unsigned length,
|
| - const Style& textStyle,
|
| - TextBlobPtr* cachedTextBlob) {
|
| + const Style& textStyle) {
|
| GraphicsContextStateSaver stateSaver(m_graphicsContext, false);
|
| updateGraphicsContext(textStyle, stateSaver);
|
| if (m_combinedText) {
|
| m_graphicsContext.save();
|
| m_combinedText->transformToInlineCoordinates(m_graphicsContext,
|
| m_textBounds);
|
| - paintInternal<PaintText>(startOffset, endOffset, length, cachedTextBlob);
|
| + paintInternal<PaintText>(startOffset, endOffset, length);
|
| m_graphicsContext.restore();
|
| } else {
|
| - paintInternal<PaintText>(startOffset, endOffset, length, cachedTextBlob);
|
| + paintInternal<PaintText>(startOffset, endOffset, length);
|
| }
|
|
|
| if (!m_emphasisMark.isEmpty()) {
|
| @@ -238,13 +237,10 @@ void TextPainter::paintInternalRun(TextRunPaintInfo& textRunPaintInfo,
|
| template <TextPainter::PaintInternalStep Step>
|
| void TextPainter::paintInternal(unsigned startOffset,
|
| unsigned endOffset,
|
| - unsigned truncationPoint,
|
| - TextBlobPtr* cachedTextBlob) {
|
| + unsigned truncationPoint) {
|
| TextRunPaintInfo textRunPaintInfo(m_run);
|
| textRunPaintInfo.bounds = FloatRect(m_textBounds);
|
| if (startOffset <= endOffset) {
|
| - // FIXME: We should be able to use cachedTextBlob in more cases.
|
| - textRunPaintInfo.cachedTextBlob = cachedTextBlob;
|
| paintInternalRun<Step>(textRunPaintInfo, startOffset, endOffset);
|
| } else {
|
| if (endOffset > 0)
|
|
|