| 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 be5d0e012c4311f43830984b65344ef2a0fb229d..83db72e4b22b19dcee261017fdb73d6622785b3a 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -830,7 +830,7 @@ public:
|
| }
|
|
|
| // float
|
| - static EFloat initialFloating() { return EFloat::NoFloat; }
|
| + static EFloat initialFloating() { return EFloat::None; }
|
| EFloat floating() const { return static_cast<EFloat>(m_nonInheritedData.m_floating); }
|
| void setFloating(EFloat v) { m_nonInheritedData.m_floating = static_cast<unsigned>(v); }
|
|
|
| @@ -2133,7 +2133,7 @@ public:
|
| const LayoutRectOutsets insets, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
|
|
|
| // Float utility functions.
|
| - bool isFloating() const { return floating() != EFloat::NoFloat; }
|
| + bool isFloating() const { return floating() != EFloat::None; }
|
|
|
| // Mix-blend-mode utility functions.
|
| bool hasBlendMode() const { return blendMode() != WebBlendModeNormal; }
|
|
|