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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutInline.cpp

Issue 2578403002: Changed EVerticalAlign to an enum class and renamed its members (Closed)
Patch Set: Created 4 years 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/layout/LayoutInline.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutInline.cpp b/third_party/WebKit/Source/core/layout/LayoutInline.cpp
index 7e8f2d7cc5cb804a9223ceafe91e357213d5585d..9c1c5c1270b948c3f88ffe3e6455688845fe44eb 100644
--- a/third_party/WebKit/Source/core/layout/LayoutInline.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutInline.cpp
@@ -235,8 +235,8 @@ void LayoutInline::updateAlwaysCreateLineBoxes(bool fullLayout) {
bool alwaysCreateLineBoxesNew =
(parentLayoutInline && parentLayoutInline->alwaysCreateLineBoxes()) ||
(parentLayoutInline &&
- parentStyle.verticalAlign() != VerticalAlignBaseline) ||
- style()->verticalAlign() != VerticalAlignBaseline ||
+ parentStyle.verticalAlign() != EVerticalAlign::Baseline) ||
+ style()->verticalAlign() != EVerticalAlign::Baseline ||
style()->getTextEmphasisMark() != TextEmphasisMarkNone ||
(checkFonts &&
(!styleRef().hasIdenticalAscentDescentAndLineGap(parentStyle) ||
@@ -249,7 +249,7 @@ void LayoutInline::updateAlwaysCreateLineBoxes(bool fullLayout) {
const ComputedStyle& childStyle = styleRef(true);
alwaysCreateLineBoxesNew =
!firstLineParentStyle.hasIdenticalAscentDescentAndLineGap(childStyle) ||
- childStyle.verticalAlign() != VerticalAlignBaseline ||
+ childStyle.verticalAlign() != EVerticalAlign::Baseline ||
firstLineParentStyle.lineHeight() != childStyle.lineHeight();
}

Powered by Google App Engine
This is Rietveld 408576698