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

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

Issue 2367293002: Changed EListStyleType to an enum class and renamed its members to keywords (Closed)
Patch Set: Final patch + formatting Created 4 years, 1 month 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 7645fc4d8111f7e6429185ceb5cf62f59f69ead5..ff330aa4c81150bd038b373e2c08dd6a5246bd46 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -363,7 +363,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
void setBitDefaults() {
ComputedStyleBase::setBitDefaults();
m_inheritedData.m_captionSide = static_cast<unsigned>(initialCaptionSide());
- m_inheritedData.m_listStyleType = initialListStyleType();
+ m_inheritedData.m_listStyleType =
+ static_cast<unsigned>(initialListStyleType());
m_inheritedData.m_listStylePosition =
static_cast<unsigned>(initialListStylePosition());
m_inheritedData.m_textAlign = initialTextAlign();
@@ -2126,12 +2127,12 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// List style properties.
// list-style-type
- static EListStyleType initialListStyleType() { return Disc; }
+ static EListStyleType initialListStyleType() { return EListStyleType::Disc; }
EListStyleType listStyleType() const {
return static_cast<EListStyleType>(m_inheritedData.m_listStyleType);
}
void setListStyleType(EListStyleType v) {
- m_inheritedData.m_listStyleType = v;
+ m_inheritedData.m_listStyleType = static_cast<unsigned>(v);
}
// list-style-position

Powered by Google App Engine
This is Rietveld 408576698