| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 4c8b3f65a567cf8958571db79314be1ca9b60b7e..0bcedba105bc3b1da2f2063c641c8e03eb38a43e 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -742,11 +742,6 @@ public:
|
| float opacity() const { return rareNonInheritedData->opacity; }
|
| bool hasOpacity() const { return opacity() < 1.0f; }
|
| ControlPart appearance() const { return static_cast<ControlPart>(rareNonInheritedData->m_appearance); }
|
| - // aspect ratio convenience method
|
| - bool hasAspectRatio() const { return rareNonInheritedData->m_hasAspectRatio; }
|
| - float aspectRatio() const { return aspectRatioNumerator() / aspectRatioDenominator(); }
|
| - float aspectRatioDenominator() const { return rareNonInheritedData->m_aspectRatioDenominator; }
|
| - float aspectRatioNumerator() const { return rareNonInheritedData->m_aspectRatioNumerator; }
|
| EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonInheritedData->m_deprecatedFlexibleBox->align); }
|
| EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(inherited_flags._box_direction); }
|
| float boxFlex() const { return rareNonInheritedData->m_deprecatedFlexibleBox->flex; }
|
| @@ -1195,10 +1190,6 @@ public:
|
| void setEmptyCells(EEmptyCell v) { inherited_flags._empty_cells = v; }
|
| void setCaptionSide(ECaptionSide v) { inherited_flags._caption_side = v; }
|
|
|
| - void setHasAspectRatio(bool b) { SET_VAR(rareNonInheritedData, m_hasAspectRatio, b); }
|
| - void setAspectRatioDenominator(float v) { SET_VAR(rareNonInheritedData, m_aspectRatioDenominator, v); }
|
| - void setAspectRatioNumerator(float v) { SET_VAR(rareNonInheritedData, m_aspectRatioNumerator, v); }
|
| -
|
| void setListStyleType(EListStyleType v) { inherited_flags._list_style_type = v; }
|
| void setListStyleImage(PassRefPtr<StyleImage>);
|
| void setListStylePosition(EListStylePosition v) { inherited_flags._list_style_position = v; }
|
| @@ -1648,9 +1639,6 @@ public:
|
| static const AtomicString& initialLocale() { return nullAtom; }
|
| static EResize initialResize() { return RESIZE_NONE; }
|
| static ControlPart initialAppearance() { return NoControlPart; }
|
| - static bool initialHasAspectRatio() { return false; }
|
| - static float initialAspectRatioDenominator() { return 1; }
|
| - static float initialAspectRatioNumerator() { return 1; }
|
| static Order initialRTLOrdering() { return LogicalOrder; }
|
| static float initialTextStrokeWidth() { return 0; }
|
| static unsigned short initialColumnCount() { return 1; }
|
|
|