| 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 c4eecd3b6a74412144547a1a8b99c1fc12f55d75..7c5235afc84e880b7812d9da6551a9f4b6942dd6 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -320,7 +320,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| m_nonInheritedData.m_clear = initialClear();
|
| m_nonInheritedData.m_position = initialPosition();
|
| m_nonInheritedData.m_tableLayout = initialTableLayout();
|
| - m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi();
|
| + m_nonInheritedData.m_unicodeBidi =
|
| + static_cast<unsigned>(initialUnicodeBidi());
|
| m_nonInheritedData.m_breakBefore = initialBreakBefore();
|
| m_nonInheritedData.m_breakAfter = initialBreakAfter();
|
| m_nonInheritedData.m_breakInside = initialBreakInside();
|
| @@ -1858,11 +1859,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| }
|
|
|
| // unicode-bidi
|
| - static EUnicodeBidi initialUnicodeBidi() { return UBNormal; }
|
| + static EUnicodeBidi initialUnicodeBidi() { return EUnicodeBidi::kNormal; }
|
| EUnicodeBidi unicodeBidi() const {
|
| return static_cast<EUnicodeBidi>(m_nonInheritedData.m_unicodeBidi);
|
| }
|
| - void setUnicodeBidi(EUnicodeBidi b) { m_nonInheritedData.m_unicodeBidi = b; }
|
| + void setUnicodeBidi(EUnicodeBidi b) {
|
| + m_nonInheritedData.m_unicodeBidi = static_cast<unsigned>(b);
|
| + }
|
|
|
| // vertical-align
|
| static EVerticalAlign initialVerticalAlign() {
|
|
|