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

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

Issue 2507383002: Changed ETextAlign to an enum class and renamed its members to keywords (Closed)
Patch Set: Created 4 years, 1 month 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/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index efe78d6c683c6f021062303079e58825e0ee8b8f..acb7b3f50585e036b731d7fd1f9d651d06f9a5a5 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -2812,7 +2812,7 @@ void LayoutBox::computeMarginsForDirection(MarginDirection flowDirection,
const ComputedStyle& containingBlockStyle = containingBlock->styleRef();
if ((marginStartLength.isAuto() && marginEndLength.isAuto()) ||
(!marginStartLength.isAuto() && !marginEndLength.isAuto() &&
- containingBlockStyle.textAlign() == WEBKIT_CENTER)) {
+ containingBlockStyle.textAlign() == ETextAlign::WebkitCenter)) {
// Other browsers center the margin box for align=center elements so we
// match them here.
LayoutUnit centeredMarginBoxStart = std::max(
@@ -2826,9 +2826,9 @@ void LayoutBox::computeMarginsForDirection(MarginDirection flowDirection,
// Adjust margins for the align attribute
if ((!containingBlockStyle.isLeftToRightDirection() &&
- containingBlockStyle.textAlign() == WEBKIT_LEFT) ||
+ containingBlockStyle.textAlign() == ETextAlign::WebkitLeft) ||
(containingBlockStyle.isLeftToRightDirection() &&
- containingBlockStyle.textAlign() == WEBKIT_RIGHT)) {
+ containingBlockStyle.textAlign() == ETextAlign::WebkitRight)) {
if (containingBlockStyle.isLeftToRightDirection() !=
styleRef().isLeftToRightDirection()) {
if (!marginStartLength.isAuto())

Powered by Google App Engine
This is Rietveld 408576698