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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp

Issue 2845773002: Make TextDecoration an enum class. (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTextCombine.cpp ('k') | third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp » ('j') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
index ecd674a4d7583721027ce5ba583f7140f6ef6cdd..dec923ea5790e7f8791a5f5bcff7a97c7678e0ff 100644
--- a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
+++ b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
@@ -907,8 +907,8 @@ LayoutUnit InlineFlowBox::MaxLogicalBottomForUnderline(
// If the text decoration isn't in effect on the child, it must be outside
// of |decorationObject|.
- if (!(curr->LineStyleRef().TextDecorationsInEffect() &
- kTextDecorationUnderline))
+ if (!EnumHasFlags(curr->LineStyleRef().TextDecorationsInEffect(),
+ TextDecoration::kUnderline))
continue;
if (decoration_object && decoration_object.IsLayoutInline() &&
@@ -934,8 +934,8 @@ LayoutUnit InlineFlowBox::MinLogicalTopForUnderline(
// If the text decoration isn't in effect on the child, it must be outside
// of |decorationObject|.
- if (!(curr->LineStyleRef().TextDecorationsInEffect() &
- kTextDecorationUnderline))
+ if (!EnumHasFlags(curr->LineStyleRef().TextDecorationsInEffect(),
+ TextDecoration::kUnderline))
continue;
if (decoration_object && decoration_object.IsLayoutInline() &&
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTextCombine.cpp ('k') | third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp » ('j') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698