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

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

Issue 2370673002: Changed EDisplay to an enum class and renamed its members to be keywords (Closed)
Patch Set: Renamed members Created 4 years, 3 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/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 2f0c98f78df8b94055def04cbc67dc3db7bdd15f..6760b32cc894ec6aa1f6ee06ac51aa90d515e693 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -1876,7 +1876,7 @@ void LayoutBox::dirtyLineBoxes(bool fullLayout)
void LayoutBox::positionLineBox(InlineBox* box)
{
if (isOutOfFlowPositioned()) {
- // Cache the x position only if we were an INLINE type originally.
alancutter (OOO until 2018) 2016/09/26 04:23:46 This should not change.
+ // Cache the x position only if we were an EDisplay::Inline type originally.
bool originallyInline = style()->isOriginalDisplayInlineType();
if (originallyInline) {
// The value is cached in the xPos of the box. We only need this value if
@@ -2817,7 +2817,7 @@ bool LayoutBox::skipContainingBlockForPercentHeightCalculation(const LayoutBox*
// objects, such as table-cells, will be treated just as if they were non-anonymous.
if (containingBlock->isAnonymous()) {
EDisplay display = containingBlock->styleRef().display();
- return display == BLOCK || display == INLINE_BLOCK;
+ return display == EDisplay::Block || display == EDisplay::InlineBlock;
}
// For quirks mode, we skip most auto-height containing blocks when computing percentages.

Powered by Google App Engine
This is Rietveld 408576698