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 2bc3d16af6f2b1075a4bbaf6778529271185c83d..94218e39f53a200ce954c5f3b7a904e890734f91 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h |
@@ -1669,15 +1669,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>, |
bool QuotesDataEquivalent(const ComputedStyle&) const; |
- // text-combine-upright (aka -webkit-text-combine, -epub-text-combine) |
- static TextCombine InitialTextCombine() { return TextCombine::kNone; } |
- TextCombine GetTextCombine() const { |
- return static_cast<TextCombine>(rare_inherited_data_->text_combine_); |
- } |
- void SetTextCombine(TextCombine v) { |
- SET_VAR(rare_inherited_data_, text_combine_, static_cast<unsigned>(v)); |
- } |
- |
// text-justify |
static TextJustify InitialTextJustify() { return kTextJustifyAuto; } |
TextJustify GetTextJustify() const { |
@@ -2201,7 +2192,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>, |
} |
// Text-combine utility functions. |
- bool HasTextCombine() const { return GetTextCombine() != TextCombine::kNone; } |
+ bool HasTextCombine() const { return TextCombine() != ETextCombine::kNone; } |
// Grid utility functions. |
const Vector<GridTrackSize>& GridAutoRepeatColumns() const { |