| Index: third_party/WebKit/Source/core/layout/CollapsedBorderValue.h
|
| diff --git a/third_party/WebKit/Source/core/layout/CollapsedBorderValue.h b/third_party/WebKit/Source/core/layout/CollapsedBorderValue.h
|
| index 816fcf65aa9f791b6d339728f49bc4eb83986801..e246348549923462011c888ee301a66a24570cb9 100644
|
| --- a/third_party/WebKit/Source/core/layout/CollapsedBorderValue.h
|
| +++ b/third_party/WebKit/Source/core/layout/CollapsedBorderValue.h
|
| @@ -48,15 +48,15 @@ class CollapsedBorderValue {
|
| CollapsedBorderValue()
|
| : color_(0),
|
| width_(0),
|
| - style_(kBorderStyleNone),
|
| + style_(static_cast<unsigned>(EBorderStyle::kNone)),
|
| precedence_(kBorderPrecedenceOff) {}
|
|
|
| CollapsedBorderValue(const BorderValue& border,
|
| const Color& color,
|
| EBorderPrecedence precedence)
|
| : color_(color),
|
| - width_(border.Style() > kBorderStyleHidden ? border.Width() : 0),
|
| - style_(border.Style()),
|
| + width_(border.Style() > EBorderStyle::kNone ? border.Width() : 0),
|
| + style_(static_cast<unsigned>(border.Style())),
|
| precedence_(precedence) {
|
| DCHECK(precedence != kBorderPrecedenceOff);
|
| }
|
|
|