| Index: sky/engine/core/rendering/style/RenderStyle.h
|
| diff --git a/sky/engine/core/rendering/style/RenderStyle.h b/sky/engine/core/rendering/style/RenderStyle.h
|
| index e844f15ad77688ec06b457824a5f5429426b7253..bbab268fb065e1661e8be51b55fd8c3d823dcaff 100644
|
| --- a/sky/engine/core/rendering/style/RenderStyle.h
|
| +++ b/sky/engine/core/rendering/style/RenderStyle.h
|
| @@ -788,9 +788,6 @@ public:
|
|
|
| bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rareNonInheritedData->m_maskBoxImage.hasImage(); }
|
|
|
| - TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInheritedData->m_textCombine); }
|
| - bool hasTextCombine() const { return textCombine() != TextCombineNone; }
|
| -
|
| unsigned tabSize() const { return rareInheritedData->m_tabSize; }
|
|
|
| // End CSS3 Getters
|
| @@ -1187,7 +1184,6 @@ public:
|
| void setTransformOriginY(const Length& l) { SET_VAR(rareNonInheritedData.access()->m_transform, m_y, l); }
|
| void setTransformOriginZ(float f) { SET_VAR(rareNonInheritedData.access()->m_transform, m_z, f); }
|
| void setSpeak(ESpeak s) { SET_VAR(rareInheritedData, speak, s); }
|
| - void setTextCombine(TextCombine v) { SET_VAR(rareNonInheritedData, m_textCombine, v); }
|
| void setTextDecorationColor(const StyleColor& c) { SET_VAR(rareNonInheritedData, m_textDecorationColor, c); }
|
| void setTextEmphasisColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInheritedData, textEmphasisColor, setTextEmphasisColor, c); }
|
| void setTextEmphasisFill(TextEmphasisFill fill) { SET_VAR(rareInheritedData, textEmphasisFill, fill); }
|
| @@ -1343,7 +1339,6 @@ public:
|
| static EClear initialClear() { return CNONE; }
|
| static LengthBox initialClip() { return LengthBox(); }
|
| static TextDirection initialDirection() { return LTR; }
|
| - static TextCombine initialTextCombine() { return TextCombineNone; }
|
| static TextOrientation initialTextOrientation() { return TextOrientationVerticalRight; }
|
| static ObjectFit initialObjectFit() { return ObjectFitFill; }
|
| static LengthPoint initialObjectPosition() { return LengthPoint(Length(50.0, Percent), Length(50.0, Percent)); }
|
|
|