Source/core/paint/InlineTextBoxPainter.cpp - Issue 950623002: Store resolved color in AppliedTextDecoration

Unified Diff: Source/core/paint/InlineTextBoxPainter.cpp

Issue 950623002: Store resolved color in AppliedTextDecoration (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: removed inherited_flags.m_textunderline Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« LayoutTests/fast/css/text-decoration-color-on-hover.html ('K') | « Source/core/layout/LayoutObject.cpp ('k') | Source/core/style/AppliedTextDecoration.h » ('j') | Source/core/style/AppliedTextDecoration.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/paint/InlineTextBoxPainter.cpp

diff --git a/Source/core/paint/InlineTextBoxPainter.cpp b/Source/core/paint/InlineTextBoxPainter.cpp

index 2f2a4ddd26b35dd015dba90b553a07c5d625e896..cba99dad3fe842f7c264c27bb2f81fd58dab1c15 100644

--- a/Source/core/paint/InlineTextBoxPainter.cpp

+++ b/Source/core/paint/InlineTextBoxPainter.cpp

@@ -19,6 +19,7 @@

#include "core/layout/line/InlineTextBox.h"

#include "core/paint/BoxPainter.h"

#include "core/paint/TextPainter.h"

+#include "core/style/AppliedTextDecoration.h"

#include "platform/graphics/paint/DrawingRecorder.h"

namespace blink {

@@ -673,12 +674,12 @@ static void strokeWavyTextDecoration(GraphicsContext* context, FloatPoint p1, Fl

}

static void paintAppliedDecoration(GraphicsContext* context, FloatPoint start, float width, float doubleOffset, int wavyOffsetFactor,

- LayoutObject::AppliedTextDecoration decoration, float thickness, bool antialiasDecoration, bool isPrinting)

+ AppliedTextDecoration decoration, float thickness, bool antialiasDecoration, bool isPrinting)

{

- context->setStrokeStyle(textDecorationStyleToStrokeStyle(decoration.style));

- context->setStrokeColor(decoration.color);

+ context->setStrokeStyle(textDecorationStyleToStrokeStyle(decoration.style()));

+ context->setStrokeColor(decoration.color());

- switch (decoration.style) {

+ switch (decoration.style()) {

wkorman 2015/07/01 15:16:14 Was there a reason we weren't using accessors prev

case TextDecorationStyleWavy:

strokeWavyTextDecoration(context, start + FloatPoint(0, doubleOffset * wavyOffsetFactor), start + FloatPoint(width, doubleOffset * wavyOffsetFactor), thickness);

break;

@@ -689,7 +690,7 @@ static void paintAppliedDecoration(GraphicsContext* context, FloatPoint start, f

default:

context->drawLineForText(start, width, isPrinting);

- if (decoration.style == TextDecorationStyleDouble)

+ if (decoration.style() == TextDecorationStyleDouble)

context->drawLineForText(start + FloatPoint(0, doubleOffset), width, isPrinting);

}

@@ -711,7 +712,7 @@ void InlineTextBoxPainter::paintDecoration(GraphicsContext* context, const Float

}

// Get the text decoration colors.

- LayoutObject::AppliedTextDecoration underline, overline, linethrough;

+ AppliedTextDecoration underline, overline, linethrough;

m_inlineTextBox.layoutObject().getTextDecorations(deco, underline, overline, linethrough, true);

if (m_inlineTextBox.isFirstLineStyle())

m_inlineTextBox.layoutObject().getTextDecorations(deco, underline, overline, linethrough, true, true);

@@ -733,7 +734,7 @@ void InlineTextBoxPainter::paintDecoration(GraphicsContext* context, const Float

context->setStrokeThickness(textDecorationThickness);

- bool antialiasDecoration = shouldSetDecorationAntialias(overline.style, underline.style, linethrough.style)

+ bool antialiasDecoration = shouldSetDecorationAntialias(overline.style(), underline.style(), linethrough.style())

&& BoxPainter::shouldAntialiasLines(context);

// Offset between lines - always non-zero, so lines never cross each other.