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

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

Issue 2666483002: Changed ETableLayout to an enum class and renamed its members (Closed)
Patch Set: Use CSS keywords 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
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 f8b43e85254401b46badced6ed2d3c03c967c555..e61d0e02b7fec15a91864167a78821acc9acf51a 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -315,7 +315,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
static_cast<unsigned>(initialVerticalAlign());
m_nonInheritedData.m_clear = initialClear();
m_nonInheritedData.m_position = initialPosition();
- m_nonInheritedData.m_tableLayout = initialTableLayout();
+ m_nonInheritedData.m_tableLayout =
+ static_cast<unsigned>(initialTableLayout());
m_nonInheritedData.m_breakBefore = initialBreakBefore();
m_nonInheritedData.m_breakAfter = initialBreakAfter();
m_nonInheritedData.m_breakInside = initialBreakInside();
@@ -1779,11 +1780,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
SET_VAR(m_rareNonInheritedData, m_pageSizeType, t);
}
// table-layout
- static ETableLayout initialTableLayout() { return TableLayoutAuto; }
+ static ETableLayout initialTableLayout() { return ETableLayout::kAuto; }
ETableLayout tableLayout() const {
return static_cast<ETableLayout>(m_nonInheritedData.m_tableLayout);
}
- void setTableLayout(ETableLayout v) { m_nonInheritedData.m_tableLayout = v; }
+ void setTableLayout(ETableLayout v) {
+ m_nonInheritedData.m_tableLayout = static_cast<unsigned>(v);
+ }
// Text decoration properties.
// text-decoration-line
@@ -3433,7 +3436,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// Table layout utility functions.
bool isFixedTableLayout() const {
- return tableLayout() == TableLayoutFixed && !logicalWidth().isAuto();
+ return tableLayout() == ETableLayout::kFixed && !logicalWidth().isAuto();
}
// Filter/transform utility functions.

Powered by Google App Engine
This is Rietveld 408576698