| 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 825e0e5fd7be9d75e7f6a0679674c4c4c12afb5b..6acf18433e0c0a833c95e5cdc101019be7f42631 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -758,9 +758,11 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| void setBoxShadow(PassRefPtr<ShadowList>);
|
|
|
| // box-sizing (aka -webkit-box-sizing)
|
| - static EBoxSizing initialBoxSizing() { return BoxSizingContentBox; }
|
| + static EBoxSizing initialBoxSizing() { return EBoxSizing::kContentBox; }
|
| EBoxSizing boxSizing() const { return m_box->boxSizing(); }
|
| - void setBoxSizing(EBoxSizing s) { SET_VAR(m_box, m_boxSizing, s); }
|
| + void setBoxSizing(EBoxSizing s) {
|
| + SET_VAR(m_box, m_boxSizing, static_cast<unsigned>(s));
|
| + }
|
|
|
| // clear
|
| static EClear initialClear() { return ClearNone; }
|
|
|