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

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

Issue 2652103002: Replace bitwise & on EClear enum with equality. (Closed)
Patch Set: 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 798e9a96da83a9e5278783f73bdaf5b7c0cab558..7a9d7bab0ad58c692bd745acb17c8717aa6f6ba0 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
@@ -1675,9 +1675,11 @@ void LayoutBlockFlow::computeInlinePreferredLogicalWidths(
clearPreviousFloat =
(prevFloat &&
((prevFloat->styleRef().floating() == EFloat::kLeft &&
- (childStyle.clear() & ClearLeft)) ||
+ (childStyle.clear() == ClearBoth ||
+ childStyle.clear() == ClearLeft)) ||
(prevFloat->styleRef().floating() == EFloat::kRight &&
- (childStyle.clear() & ClearRight))));
+ (childStyle.clear() == ClearBoth ||
+ childStyle.clear() == ClearRight))));
prevFloat = child;
} else {
clearPreviousFloat = false;
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698