| 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
|
|
|