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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)
Patch Set: Rebase Created 3 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/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index aedafd4dadccd60afd08dca267a0ab549cb700ef..2dfd875db88694754f9bc2c2c93fcab1e0f2d45c 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -851,7 +851,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
void setContent(ContentData*);
// display
- static EDisplay initialDisplay() { return EDisplay::Inline; }
+ static EDisplay initialDisplay() { return EDisplay::kInline; }
EDisplay display() const {
return static_cast<EDisplay>(m_nonInheritedData.m_effectiveDisplay);
}
@@ -3570,39 +3570,42 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
}
static bool isDisplayBlockContainer(EDisplay display) {
- return display == EDisplay::Block || display == EDisplay::ListItem ||
- display == EDisplay::InlineBlock || display == EDisplay::FlowRoot ||
- display == EDisplay::TableCell || display == EDisplay::TableCaption;
+ return display == EDisplay::kBlock || display == EDisplay::kListItem ||
+ display == EDisplay::kInlineBlock ||
+ display == EDisplay::kFlowRoot || display == EDisplay::kTableCell ||
+ display == EDisplay::kTableCaption;
}
static bool isDisplayFlexibleBox(EDisplay display) {
- return display == EDisplay::Flex || display == EDisplay::InlineFlex;
+ return display == EDisplay::kFlex || display == EDisplay::kInlineFlex;
}
static bool isDisplayGridBox(EDisplay display) {
- return display == EDisplay::Grid || display == EDisplay::InlineGrid;
+ return display == EDisplay::kGrid || display == EDisplay::kInlineGrid;
}
static bool isDisplayReplacedType(EDisplay display) {
- return display == EDisplay::InlineBlock ||
- display == EDisplay::WebkitInlineBox ||
- display == EDisplay::InlineFlex ||
- display == EDisplay::InlineTable || display == EDisplay::InlineGrid;
+ return display == EDisplay::kInlineBlock ||
+ display == EDisplay::kWebkitInlineBox ||
+ display == EDisplay::kInlineFlex ||
+ display == EDisplay::kInlineTable ||
+ display == EDisplay::kInlineGrid;
}
static bool isDisplayInlineType(EDisplay display) {
- return display == EDisplay::Inline || isDisplayReplacedType(display);
+ return display == EDisplay::kInline || isDisplayReplacedType(display);
}
static bool isDisplayTableType(EDisplay display) {
- return display == EDisplay::Table || display == EDisplay::InlineTable ||
- display == EDisplay::TableRowGroup ||
- display == EDisplay::TableHeaderGroup ||
- display == EDisplay::TableFooterGroup ||
- display == EDisplay::TableRow ||
- display == EDisplay::TableColumnGroup ||
- display == EDisplay::TableColumn || display == EDisplay::TableCell ||
- display == EDisplay::TableCaption;
+ return display == EDisplay::kTable || display == EDisplay::kInlineTable ||
+ display == EDisplay::kTableRowGroup ||
+ display == EDisplay::kTableHeaderGroup ||
+ display == EDisplay::kTableFooterGroup ||
+ display == EDisplay::kTableRow ||
+ display == EDisplay::kTableColumnGroup ||
+ display == EDisplay::kTableColumn ||
+ display == EDisplay::kTableCell ||
+ display == EDisplay::kTableCaption;
}
// Color accessors are all private to make sure callers use

Powered by Google App Engine
This is Rietveld 408576698