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

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

Issue 1766723004: style: Remame values in EOverflow and EVerticalAlign to CamelCase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enum-clash-EOverflowEVerticalAlign: rebase Created 4 years, 9 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/LayoutTableCell.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
index c985282e70458775447e2ea5a87d26ec4aafc4f9..c073fc05c7df393b27fbe0548625d7df0b180e45 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
@@ -177,26 +177,26 @@ void LayoutTableCell::computeIntrinsicPadding(int rowHeight, SubtreeLayoutScope&
int intrinsicPaddingBefore = 0;
switch (style()->verticalAlign()) {
- case SUB:
- case SUPER:
- case TEXT_TOP:
- case TEXT_BOTTOM:
- case LENGTH:
- case BASELINE: {
+ case VerticalAlignSub:
+ case VerticalAlignSuper:
+ case VerticalAlignTextTop:
+ case VerticalAlignTextBottom:
+ case VerticalAlignLength:
+ case VerticalAlignBaseline: {
int baseline = cellBaselinePosition();
if (baseline > borderBefore() + paddingBefore())
intrinsicPaddingBefore = section()->rowBaseline(rowIndex()) - (baseline - oldIntrinsicPaddingBefore);
break;
}
- case TOP:
+ case VerticalAlignTop:
break;
- case MIDDLE:
+ case VerticalAlignMiddle:
intrinsicPaddingBefore = (rowHeight - logicalHeightWithoutIntrinsicPadding) / 2;
break;
- case BOTTOM:
+ case VerticalAlignBottom:
intrinsicPaddingBefore = rowHeight - logicalHeightWithoutIntrinsicPadding;
break;
- case BASELINE_MIDDLE:
+ case VerticalAlignBaselineMiddle:
break;
}
@@ -986,7 +986,7 @@ void LayoutTableCell::scrollbarsChanged(bool horizontalScrollbarChanged, bool ve
return;
// Shrink our intrinsic padding as much as possible to accommodate the scrollbar.
- if (style()->verticalAlign() == MIDDLE) {
+ if (style()->verticalAlign() == VerticalAlignMiddle) {
LayoutUnit totalHeight = logicalHeight();
LayoutUnit heightWithoutIntrinsicPadding = totalHeight - intrinsicPaddingBefore() - intrinsicPaddingAfter();
totalHeight -= scrollbarHeight;
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTableCell.h ('k') | third_party/WebKit/Source/core/layout/LayoutTextControl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698