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

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

Issue 2370673002: Changed EDisplay to an enum class and renamed its members to be keywords (Closed)
Patch Set: Comment 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/LayoutTheme.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTheme.cpp b/third_party/WebKit/Source/core/layout/LayoutTheme.cpp
index 50bd9c24d2e7c09952e52418a2223dd78cdcb082..f87cbf447209a3db9ea4319f24a4833f0fedb9d0 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTheme.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTheme.cpp
@@ -84,13 +84,13 @@ void LayoutTheme::adjustStyle(ComputedStyle& style, Element* e)
// Force inline and table display styles to be inline-block (except for table- which is block)
ControlPart part = style.appearance();
- if (style.display() == INLINE || style.display() == INLINE_TABLE || style.display() == TABLE_ROW_GROUP
- || style.display() == TABLE_HEADER_GROUP || style.display() == TABLE_FOOTER_GROUP
- || style.display() == TABLE_ROW || style.display() == TABLE_COLUMN_GROUP || style.display() == TABLE_COLUMN
- || style.display() == TABLE_CELL || style.display() == TABLE_CAPTION)
- style.setDisplay(INLINE_BLOCK);
- else if (style.display() == LIST_ITEM || style.display() == TABLE)
- style.setDisplay(BLOCK);
+ if (style.display() == EDisplay::Inline || style.display() == EDisplay::InlineTable || style.display() == EDisplay::TableRowGroup
+ || style.display() == EDisplay::TableHeaderGroup || style.display() == EDisplay::TableFooterGroup
+ || style.display() == EDisplay::TableRow || style.display() == EDisplay::TableColumnGroup || style.display() == EDisplay::TableColumn
+ || style.display() == EDisplay::TableCell || style.display() == EDisplay::TableCaption)
+ style.setDisplay(EDisplay::InlineBlock);
+ else if (style.display() == EDisplay::ListItem || style.display() == EDisplay::Table)
+ style.setDisplay(EDisplay::Block);
if (isControlStyled(style)) {
if (part == MenulistPart) {

Powered by Google App Engine
This is Rietveld 408576698