| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 98b00217d83f95f460a82a2c9c068acf95253ff2..d46812345c17f6136e01dc6697e3f44eb5b1cb99 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -42,7 +42,6 @@
|
| #include "core/rendering/style/BorderValue.h"
|
| #include "core/rendering/style/CounterDirectives.h"
|
| #include "core/rendering/style/DataRef.h"
|
| -#include "core/rendering/style/LineClampValue.h"
|
| #include "core/rendering/style/NinePieceImage.h"
|
| #include "core/rendering/style/OutlineValue.h"
|
| #include "core/rendering/style/RenderStyleConstants.h"
|
| @@ -888,7 +887,6 @@ public:
|
| bool isRunningAcceleratedAnimation() const { return rareNonInheritedData->m_runningAcceleratedAnimation; }
|
|
|
| LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxContain; }
|
| - const LineClampValue& lineClamp() const { return rareNonInheritedData->lineClamp; }
|
| Color tapHighlightColor() const { return rareInheritedData->tapHighlightColor; }
|
| ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareInheritedData->textSecurity); }
|
|
|
| @@ -1319,7 +1317,6 @@ public:
|
| void setIsRunningAcceleratedAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_runningAcceleratedAnimation, b); }
|
|
|
| void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_lineBoxContain, c); }
|
| - void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClamp, c); }
|
| void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHighlightColor, c); }
|
| void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedData, textSecurity, aTextSecurity); }
|
| void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAction, t); }
|
| @@ -1653,7 +1650,6 @@ public:
|
|
|
| // Keep these at the end.
|
| // FIXME: Why? Seems these should all be one big sorted list.
|
| - static LineClampValue initialLineClamp() { return LineClampValue(); }
|
| static ETextSecurity initialTextSecurity() { return TSNONE; }
|
| static Color initialTapHighlightColor();
|
| static const FilterOperations& initialFilter() { DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }
|
|
|