| 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 9823d00a0dcc8a64af401490b4aef5d22413a90f..884e5997c3252cff4f524a7b2e9066752d578691 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -1757,7 +1757,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
|
|
|
| // text-orientation (aka -webkit-text-orientation, -epub-text-orientation)
|
| static TextOrientation InitialTextOrientation() {
|
| - return kTextOrientationMixed;
|
| + return TextOrientation::kMixed;
|
| }
|
| TextOrientation GetTextOrientation() const {
|
| return static_cast<TextOrientation>(
|
| @@ -3781,10 +3781,12 @@ inline bool ComputedStyle::IsSharable() const {
|
|
|
| inline bool ComputedStyle::SetTextOrientation(
|
| TextOrientation text_orientation) {
|
| - if (compareEqual(rare_inherited_data_->text_orientation_, text_orientation))
|
| + if (compareEqual(rare_inherited_data_->text_orientation_,
|
| + static_cast<unsigned>(text_orientation)))
|
| return false;
|
|
|
| - rare_inherited_data_.Access()->text_orientation_ = text_orientation;
|
| + rare_inherited_data_.Access()->text_orientation_ =
|
| + static_cast<unsigned>(text_orientation);
|
| return true;
|
| }
|
|
|
|
|