| 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 cbe16b12576fab869e05ebc4169345f70807041a..3e64a061bb8b4acd2fedea5bff61ce2eaef3451d 100644
|
| --- a/sky/engine/core/rendering/style/RenderStyle.h
|
| +++ b/sky/engine/core/rendering/style/RenderStyle.h
|
| @@ -1195,16 +1195,6 @@ public:
|
| bool requiresAcceleratedCompositingForExternalReasons(bool b) { return rareNonInheritedData->m_requiresAcceleratedCompositingForExternalReasons; }
|
| void setRequiresAcceleratedCompositingForExternalReasons(bool b) { SET_VAR(rareNonInheritedData, m_requiresAcceleratedCompositingForExternalReasons, b); }
|
|
|
| - void setShapeOutside(PassRefPtr<ShapeValue> value)
|
| - {
|
| - if (rareNonInheritedData->m_shapeOutside == value)
|
| - return;
|
| - rareNonInheritedData.access()->m_shapeOutside = value;
|
| - }
|
| - ShapeValue* shapeOutside() const { return rareNonInheritedData->m_shapeOutside.get(); }
|
| -
|
| - static ShapeValue* initialShapeOutside() { return 0; }
|
| -
|
| void setClipPath(PassRefPtr<ClipPathOperation> operation)
|
| {
|
| if (rareNonInheritedData->m_clipPath != operation)
|
| @@ -1214,18 +1204,6 @@ public:
|
|
|
| static ClipPathOperation* initialClipPath() { return 0; }
|
|
|
| - const Length& shapeMargin() const { return rareNonInheritedData->m_shapeMargin; }
|
| - void setShapeMargin(const Length& shapeMargin) { SET_VAR(rareNonInheritedData, m_shapeMargin, shapeMargin); }
|
| - static Length initialShapeMargin() { return Length(0, Fixed); }
|
| -
|
| - float shapeImageThreshold() const { return rareNonInheritedData->m_shapeImageThreshold; }
|
| - void setShapeImageThreshold(float shapeImageThreshold)
|
| - {
|
| - float clampedShapeImageThreshold = clampTo<float>(shapeImageThreshold, 0, 1);
|
| - SET_VAR(rareNonInheritedData, m_shapeImageThreshold, clampedShapeImageThreshold);
|
| - }
|
| - static float initialShapeImageThreshold() { return 0; }
|
| -
|
| bool hasContent() const { return contentData(); }
|
| const ContentData* contentData() const { return rareNonInheritedData->m_content.get(); }
|
| bool contentDataEquivalent(const RenderStyle* otherStyle) const { return const_cast<RenderStyle*>(this)->rareNonInheritedData->contentDataEquivalent(*const_cast<RenderStyle*>(otherStyle)->rareNonInheritedData); }
|
|
|