| 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 dc7f23d61b54a35324c0e935bac9e9d41ad7b8be..1da75042377f0b4cd244981e3e46a3d6d53b56b8 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -373,7 +373,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| m_inheritedData.m_whiteSpace = static_cast<unsigned>(initialWhiteSpace());
|
| m_inheritedData.m_borderCollapse = initialBorderCollapse();
|
| m_inheritedData.m_rtlOrdering = initialRTLOrdering();
|
| - m_inheritedData.m_boxDirection = initialBoxDirection();
|
| + m_inheritedData.m_boxDirection =
|
| + static_cast<unsigned>(initialBoxDirection());
|
| m_inheritedData.m_printColorAdjust =
|
| static_cast<unsigned>(initialPrintColorAdjust());
|
| m_inheritedData.m_pointerEvents = initialPointerEvents();
|
| @@ -2385,11 +2386,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| }
|
|
|
| // -webkit-box-direction
|
| - static EBoxDirection initialBoxDirection() { return BNORMAL; }
|
| + static EBoxDirection initialBoxDirection() { return EBoxDirection::Normal; }
|
| EBoxDirection boxDirection() const {
|
| return static_cast<EBoxDirection>(m_inheritedData.m_boxDirection);
|
| }
|
| - void setBoxDirection(EBoxDirection d) { m_inheritedData.m_boxDirection = d; }
|
| + void setBoxDirection(EBoxDirection d) {
|
| + m_inheritedData.m_boxDirection = static_cast<unsigned>(d);
|
| + }
|
|
|
| // -webkit-highlight
|
| static const AtomicString& initialHighlight() { return nullAtom; }
|
|
|