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

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

Issue 2653123002: Changed EClear to an enum class and renamed its members (Closed)
Patch Set: Rebase Created 3 years, 11 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/layout/LayoutBlockFlowLine.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
index d6ea8abb9957d2f586a7c8a28f6dbc840a1dc970..8fb9566e8c73af9b0f06cb233fe95bf76097d27d 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
@@ -1675,11 +1675,11 @@ void LayoutBlockFlow::computeInlinePreferredLogicalWidths(
clearPreviousFloat =
(prevFloat &&
((prevFloat->styleRef().floating() == EFloat::kLeft &&
- (childStyle.clear() == ClearBoth ||
- childStyle.clear() == ClearLeft)) ||
+ (childStyle.clear() == EClear::kBoth ||
+ childStyle.clear() == EClear::kLeft)) ||
(prevFloat->styleRef().floating() == EFloat::kRight &&
- (childStyle.clear() == ClearBoth ||
- childStyle.clear() == ClearRight))));
+ (childStyle.clear() == EClear::kBoth ||
+ childStyle.clear() == EClear::kRight))));
prevFloat = child;
} else {
clearPreviousFloat = false;
@@ -2139,7 +2139,7 @@ bool LayoutBlockFlow::lineBoxHasBRWithClearance(RootInlineBox* curr) {
? curr->lastLeafChild()
: curr->firstLeafChild();
return lastBox && lastBox->getLineLayoutItem().isBR() &&
- lastBox->getLineLayoutItem().style()->clear() != ClearNone;
+ lastBox->getLineLayoutItem().style()->clear() != EClear::kNone;
}
void LayoutBlockFlow::determineEndPosition(LineLayoutState& layoutState,

Powered by Google App Engine
This is Rietveld 408576698