Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1569)

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 647723002: Remove -webkit-aspect-ratio. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Forgot to remove webkitAspectRatio from virtual/stable. :( Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 void getTextShadowExtent(LayoutUnit& top, LayoutUnit& right, LayoutUnit& bot tom, LayoutUnit& left) const { getShadowExtent(textShadow(), top, right, bottom, left); } 735 void getTextShadowExtent(LayoutUnit& top, LayoutUnit& right, LayoutUnit& bot tom, LayoutUnit& left) const { getShadowExtent(textShadow(), top, right, bottom, left); }
736 void getTextShadowHorizontalExtent(LayoutUnit& left, LayoutUnit& right) cons t { getShadowHorizontalExtent(textShadow(), left, right); } 736 void getTextShadowHorizontalExtent(LayoutUnit& left, LayoutUnit& right) cons t { getShadowHorizontalExtent(textShadow(), left, right); }
737 void getTextShadowVerticalExtent(LayoutUnit& top, LayoutUnit& bottom) const { getShadowVerticalExtent(textShadow(), top, bottom); } 737 void getTextShadowVerticalExtent(LayoutUnit& top, LayoutUnit& bottom) const { getShadowVerticalExtent(textShadow(), top, bottom); }
738 void getTextShadowInlineDirectionExtent(LayoutUnit& logicalLeft, LayoutUnit& logicalRight) { getShadowInlineDirectionExtent(textShadow(), logicalLeft, logic alRight); } 738 void getTextShadowInlineDirectionExtent(LayoutUnit& logicalLeft, LayoutUnit& logicalRight) { getShadowInlineDirectionExtent(textShadow(), logicalLeft, logic alRight); }
739 void getTextShadowBlockDirectionExtent(LayoutUnit& logicalTop, LayoutUnit& l ogicalBottom) { getShadowBlockDirectionExtent(textShadow(), logicalTop, logicalB ottom); } 739 void getTextShadowBlockDirectionExtent(LayoutUnit& logicalTop, LayoutUnit& l ogicalBottom) { getShadowBlockDirectionExtent(textShadow(), logicalTop, logicalB ottom); }
740 740
741 float textStrokeWidth() const { return rareInheritedData->textStrokeWidth; } 741 float textStrokeWidth() const { return rareInheritedData->textStrokeWidth; }
742 float opacity() const { return rareNonInheritedData->opacity; } 742 float opacity() const { return rareNonInheritedData->opacity; }
743 bool hasOpacity() const { return opacity() < 1.0f; } 743 bool hasOpacity() const { return opacity() < 1.0f; }
744 ControlPart appearance() const { return static_cast<ControlPart>(rareNonInhe ritedData->m_appearance); } 744 ControlPart appearance() const { return static_cast<ControlPart>(rareNonInhe ritedData->m_appearance); }
745 // aspect ratio convenience method
746 bool hasAspectRatio() const { return rareNonInheritedData->m_hasAspectRatio; }
747 float aspectRatio() const { return aspectRatioNumerator() / aspectRatioDenom inator(); }
748 float aspectRatioDenominator() const { return rareNonInheritedData->m_aspect RatioDenominator; }
749 float aspectRatioNumerator() const { return rareNonInheritedData->m_aspectRa tioNumerator; }
750 EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonIn heritedData->m_deprecatedFlexibleBox->align); } 745 EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonIn heritedData->m_deprecatedFlexibleBox->align); }
751 EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(inher ited_flags._box_direction); } 746 EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(inher ited_flags._box_direction); }
752 float boxFlex() const { return rareNonInheritedData->m_deprecatedFlexibleBox ->flex; } 747 float boxFlex() const { return rareNonInheritedData->m_deprecatedFlexibleBox ->flex; }
753 unsigned boxFlexGroup() const { return rareNonInheritedData->m_deprecatedFle xibleBox->flexGroup; } 748 unsigned boxFlexGroup() const { return rareNonInheritedData->m_deprecatedFle xibleBox->flexGroup; }
754 EBoxLines boxLines() const { return static_cast<EBoxLines>(rareNonInheritedD ata->m_deprecatedFlexibleBox->lines); } 749 EBoxLines boxLines() const { return static_cast<EBoxLines>(rareNonInheritedD ata->m_deprecatedFlexibleBox->lines); }
755 unsigned boxOrdinalGroup() const { return rareNonInheritedData->m_deprecated FlexibleBox->ordinalGroup; } 750 unsigned boxOrdinalGroup() const { return rareNonInheritedData->m_deprecated FlexibleBox->ordinalGroup; }
756 EBoxOrient boxOrient() const { return static_cast<EBoxOrient>(rareNonInherit edData->m_deprecatedFlexibleBox->orient); } 751 EBoxOrient boxOrient() const { return static_cast<EBoxOrient>(rareNonInherit edData->m_deprecatedFlexibleBox->orient); }
757 EBoxPack boxPack() const { return static_cast<EBoxPack>(rareNonInheritedData ->m_deprecatedFlexibleBox->pack); } 752 EBoxPack boxPack() const { return static_cast<EBoxPack>(rareNonInheritedData ->m_deprecatedFlexibleBox->pack); }
758 753
759 int order() const { return rareNonInheritedData->m_order; } 754 int order() const { return rareNonInheritedData->m_order; }
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 void setMaskXPosition(const Length& length) { SET_VAR(rareNonInheritedData, m_mask.m_xPosition, length); } 1183 void setMaskXPosition(const Length& length) { SET_VAR(rareNonInheritedData, m_mask.m_xPosition, length); }
1189 void setMaskYPosition(const Length& length) { SET_VAR(rareNonInheritedData, m_mask.m_yPosition, length); } 1184 void setMaskYPosition(const Length& length) { SET_VAR(rareNonInheritedData, m_mask.m_yPosition, length); }
1190 void setMaskSize(const LengthSize& s) { SET_VAR(rareNonInheritedData, m_mask .m_sizeLength, s); } 1185 void setMaskSize(const LengthSize& s) { SET_VAR(rareNonInheritedData, m_mask .m_sizeLength, s); }
1191 1186
1192 void setBorderCollapse(EBorderCollapse collapse) { inherited_flags._border_c ollapse = collapse; } 1187 void setBorderCollapse(EBorderCollapse collapse) { inherited_flags._border_c ollapse = collapse; }
1193 void setHorizontalBorderSpacing(short); 1188 void setHorizontalBorderSpacing(short);
1194 void setVerticalBorderSpacing(short); 1189 void setVerticalBorderSpacing(short);
1195 void setEmptyCells(EEmptyCell v) { inherited_flags._empty_cells = v; } 1190 void setEmptyCells(EEmptyCell v) { inherited_flags._empty_cells = v; }
1196 void setCaptionSide(ECaptionSide v) { inherited_flags._caption_side = v; } 1191 void setCaptionSide(ECaptionSide v) { inherited_flags._caption_side = v; }
1197 1192
1198 void setHasAspectRatio(bool b) { SET_VAR(rareNonInheritedData, m_hasAspectRa tio, b); }
1199 void setAspectRatioDenominator(float v) { SET_VAR(rareNonInheritedData, m_as pectRatioDenominator, v); }
1200 void setAspectRatioNumerator(float v) { SET_VAR(rareNonInheritedData, m_aspe ctRatioNumerator, v); }
1201
1202 void setListStyleType(EListStyleType v) { inherited_flags._list_style_type = v; } 1193 void setListStyleType(EListStyleType v) { inherited_flags._list_style_type = v; }
1203 void setListStyleImage(PassRefPtr<StyleImage>); 1194 void setListStyleImage(PassRefPtr<StyleImage>);
1204 void setListStylePosition(EListStylePosition v) { inherited_flags._list_styl e_position = v; } 1195 void setListStylePosition(EListStylePosition v) { inherited_flags._list_styl e_position = v; }
1205 1196
1206 void setMarginTop(const Length& v) { SET_VAR(surround, margin.m_top, v); } 1197 void setMarginTop(const Length& v) { SET_VAR(surround, margin.m_top, v); }
1207 void setMarginBottom(const Length& v) { SET_VAR(surround, margin.m_bottom, v ); } 1198 void setMarginBottom(const Length& v) { SET_VAR(surround, margin.m_bottom, v ); }
1208 void setMarginLeft(const Length& v) { SET_VAR(surround, margin.m_left, v); } 1199 void setMarginLeft(const Length& v) { SET_VAR(surround, margin.m_left, v); }
1209 void setMarginRight(const Length& v) { SET_VAR(surround, margin.m_right, v); } 1200 void setMarginRight(const Length& v) { SET_VAR(surround, margin.m_right, v); }
1210 void setMarginStart(const Length&); 1201 void setMarginStart(const Length&);
1211 void setMarginEnd(const Length&); 1202 void setMarginEnd(const Length&);
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1641 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; } 1632 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; }
1642 static EWordBreak initialWordBreak() { return NormalWordBreak; } 1633 static EWordBreak initialWordBreak() { return NormalWordBreak; }
1643 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } 1634 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; }
1644 static LineBreak initialLineBreak() { return LineBreakAuto; } 1635 static LineBreak initialLineBreak() { return LineBreakAuto; }
1645 static const AtomicString& initialHighlight() { return nullAtom; } 1636 static const AtomicString& initialHighlight() { return nullAtom; }
1646 static ESpeak initialSpeak() { return SpeakNormal; } 1637 static ESpeak initialSpeak() { return SpeakNormal; }
1647 static const AtomicString& initialHyphenationString() { return nullAtom; } 1638 static const AtomicString& initialHyphenationString() { return nullAtom; }
1648 static const AtomicString& initialLocale() { return nullAtom; } 1639 static const AtomicString& initialLocale() { return nullAtom; }
1649 static EResize initialResize() { return RESIZE_NONE; } 1640 static EResize initialResize() { return RESIZE_NONE; }
1650 static ControlPart initialAppearance() { return NoControlPart; } 1641 static ControlPart initialAppearance() { return NoControlPart; }
1651 static bool initialHasAspectRatio() { return false; }
1652 static float initialAspectRatioDenominator() { return 1; }
1653 static float initialAspectRatioNumerator() { return 1; }
1654 static Order initialRTLOrdering() { return LogicalOrder; } 1642 static Order initialRTLOrdering() { return LogicalOrder; }
1655 static float initialTextStrokeWidth() { return 0; } 1643 static float initialTextStrokeWidth() { return 0; }
1656 static unsigned short initialColumnCount() { return 1; } 1644 static unsigned short initialColumnCount() { return 1; }
1657 static ColumnFill initialColumnFill() { return ColumnFillBalance; } 1645 static ColumnFill initialColumnFill() { return ColumnFillBalance; }
1658 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; } 1646 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; }
1659 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T ransformOperations, ops, ()); return ops; } 1647 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T ransformOperations, ops, ()); return ops; }
1660 static Length initialTransformOriginX() { return Length(50.0, Percent); } 1648 static Length initialTransformOriginX() { return Length(50.0, Percent); }
1661 static Length initialTransformOriginY() { return Length(50.0, Percent); } 1649 static Length initialTransformOriginY() { return Length(50.0, Percent); }
1662 static EPointerEvents initialPointerEvents() { return PE_AUTO; } 1650 static EPointerEvents initialPointerEvents() { return PE_AUTO; }
1663 static float initialTransformOriginZ() { return 0; } 1651 static float initialTransformOriginZ() { return 0; }
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
1922 inline bool RenderStyle::hasPseudoElementStyle() const 1910 inline bool RenderStyle::hasPseudoElementStyle() const
1923 { 1911 {
1924 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1912 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1925 } 1913 }
1926 1914
1927 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1915 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1928 1916
1929 } // namespace blink 1917 } // namespace blink
1930 1918
1931 #endif // RenderStyle_h 1919 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698