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 5f3cb9e0a2a9a204911be4b6a9b3dcb239b7ea8b..ff869fc1718e43d98105dfb0ab5c342739393d64 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h |
@@ -1021,12 +1021,12 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase, |
} |
// isolation |
- static EIsolation InitialIsolation() { return kIsolationAuto; } |
+ static EIsolation InitialIsolation() { return EIsolation::kAuto; } |
EIsolation Isolation() const { |
return static_cast<EIsolation>(rare_non_inherited_data_->isolation_); |
} |
void SetIsolation(EIsolation v) { |
- rare_non_inherited_data_.Access()->isolation_ = v; |
+ rare_non_inherited_data_.Access()->isolation_ = static_cast<unsigned>(v); |
} |
// -webkit-margin-before-collapse (aka -webkit-margin-top-collapse) |
@@ -2947,7 +2947,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase, |
bool IsDisplayFlexibleBox() const { return IsDisplayFlexibleBox(Display()); } |
// Isolation utility functions. |
- bool HasIsolation() const { return Isolation() != kIsolationAuto; } |
+ bool HasIsolation() const { return Isolation() != EIsolation::kAuto; } |
// Content utility functions. |
bool HasContent() const { return GetContentData(); } |