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 3cad814d0a04cde387afbf0bfe434cd602ece8a0..d7a251f4d38f99e69aae3042d8cd45742a049e49 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h |
@@ -313,7 +313,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase, |
m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY()); |
m_nonInheritedData.m_verticalAlign = |
static_cast<unsigned>(initialVerticalAlign()); |
- m_nonInheritedData.m_clear = initialClear(); |
+ m_nonInheritedData.m_clear = static_cast<unsigned>(initialClear()); |
m_nonInheritedData.m_position = initialPosition(); |
m_nonInheritedData.m_tableLayout = |
static_cast<unsigned>(initialTableLayout()); |
@@ -767,11 +767,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase, |
} |
// clear |
- static EClear initialClear() { return ClearNone; } |
+ static EClear initialClear() { return EClear::kNone; } |
EClear clear() const { |
return static_cast<EClear>(m_nonInheritedData.m_clear); |
} |
- void setClear(EClear v) { m_nonInheritedData.m_clear = v; } |
+ void setClear(EClear v) { |
+ m_nonInheritedData.m_clear = static_cast<unsigned>(v); |
+ } |
// Page break properties. |
// break-after (shorthand for page-break-after and -webkit-column-break-after) |