| 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 d70c43f78d2d162af1cc868f6750a8fcc26fb140..cd5c671d9f278f3526b45d7dcdb10772d53ffa1e 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -344,7 +344,7 @@ protected:
|
| {
|
| ComputedStyleBase::setBitDefaults();
|
| m_inheritedData.m_emptyCells = initialEmptyCells();
|
| - m_inheritedData.m_captionSide = initialCaptionSide();
|
| + m_inheritedData.m_captionSide = static_cast<unsigned>(initialCaptionSide());
|
| m_inheritedData.m_listStyleType = initialListStyleType();
|
| m_inheritedData.m_listStylePosition = initialListStylePosition();
|
| m_inheritedData.m_textAlign = initialTextAlign();
|
| @@ -1363,9 +1363,9 @@ public:
|
| void setVerticalBorderSpacing(short);
|
|
|
| // caption-side (aka -epub-caption-side)
|
| - static ECaptionSide initialCaptionSide() { return CaptionSideTop; }
|
| + static ECaptionSide initialCaptionSide() { return ECaptionSide::Top; }
|
| ECaptionSide captionSide() const { return static_cast<ECaptionSide>(m_inheritedData.m_captionSide); }
|
| - void setCaptionSide(ECaptionSide v) { m_inheritedData.m_captionSide = v; }
|
| + void setCaptionSide(ECaptionSide v) { m_inheritedData.m_captionSide = static_cast<unsigned>(v); }
|
|
|
| // cursor
|
| static ECursor initialCursor() { return CURSOR_AUTO; }
|
|
|