Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(639)

Unified Diff: third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp

Issue 2845773002: Make TextDecoration an enum class. (Closed)
Patch Set: Rebase Created 3 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
Index: third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
index 65fc6c73a391338f289b6aecf6b23e14278c7d9e..b2c018dbfc92fe6bbe44836dd5de9dc78cc9292d 100644
--- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
@@ -180,10 +180,10 @@ void SVGInlineTextBoxPainter::PaintTextFragments(
const Vector<AppliedTextDecoration>& decorations =
style.AppliedTextDecorations();
for (const AppliedTextDecoration& decoration : decorations) {
- if (decoration.Lines() & kTextDecorationUnderline)
- PaintDecoration(paint_info, kTextDecorationUnderline, fragment);
- if (decoration.Lines() & kTextDecorationOverline)
- PaintDecoration(paint_info, kTextDecorationOverline, fragment);
+ if (EnumHasFlags(decoration.Lines(), TextDecoration::kUnderline))
+ PaintDecoration(paint_info, TextDecoration::kUnderline, fragment);
+ if (EnumHasFlags(decoration.Lines(), TextDecoration::kOverline))
+ PaintDecoration(paint_info, TextDecoration::kOverline, fragment);
}
for (int i = 0; i < 3; i++) {
@@ -210,8 +210,8 @@ void SVGInlineTextBoxPainter::PaintTextFragments(
// Spec: Line-through should be drawn after the text is filled and stroked;
// thus, the line-through is rendered on top of the text.
for (const AppliedTextDecoration& decoration : decorations) {
- if (decoration.Lines() & kTextDecorationLineThrough)
- PaintDecoration(paint_info, kTextDecorationLineThrough, fragment);
+ if (EnumHasFlags(decoration.Lines(), TextDecoration::kLineThrough))
+ PaintDecoration(paint_info, TextDecoration::kLineThrough, fragment);
}
}
}
@@ -271,7 +271,7 @@ static inline LayoutObject* FindLayoutObjectDefininingTextDecoration(
LineLayoutAPIShim::LayoutObjectFrom(parent_box->GetLineLayoutItem());
if (layout_object->Style() &&
- layout_object->Style()->GetTextDecoration() != kTextDecorationNone)
+ layout_object->Style()->GetTextDecoration() != TextDecoration::kNone)
break;
parent_box = parent_box->Parent();
@@ -289,11 +289,11 @@ static inline float BaselineOffsetForDecoration(TextDecoration decoration,
// FIXME: For SVG Fonts we need to use the attributes defined in the
// <font-face> if specified.
// Compatible with Batik/Presto.
- if (decoration == kTextDecorationUnderline)
+ if (decoration == TextDecoration::kUnderline)
return -thickness * 1.5f;
- if (decoration == kTextDecorationOverline)
+ if (decoration == TextDecoration::kOverline)
return font_metrics.FloatAscent() - thickness;
- if (decoration == kTextDecorationLineThrough)
+ if (decoration == TextDecoration::kLineThrough)
return font_metrics.FloatAscent() * 3 / 8.0f;
NOTREACHED();
@@ -312,7 +312,7 @@ void SVGInlineTextBoxPainter::PaintDecoration(const PaintInfo& paint_info,
const SVGTextFragment& fragment) {
if (svg_inline_text_box_.GetLineLayoutItem()
.Style()
- ->TextDecorationsInEffect() == kTextDecorationNone)
+ ->TextDecorationsInEffect() == TextDecoration::kNone)
return;
if (fragment.width <= 0)

Powered by Google App Engine
This is Rietveld 408576698