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

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

Issue 207783002: Omit "int" when using "unsigned" modifier (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 float opacity() const { return rareNonInheritedData->opacity; } 744 float opacity() const { return rareNonInheritedData->opacity; }
745 ControlPart appearance() const { return static_cast<ControlPart>(rareNonInhe ritedData->m_appearance); } 745 ControlPart appearance() const { return static_cast<ControlPart>(rareNonInhe ritedData->m_appearance); }
746 // aspect ratio convenience method 746 // aspect ratio convenience method
747 bool hasAspectRatio() const { return rareNonInheritedData->m_hasAspectRatio; } 747 bool hasAspectRatio() const { return rareNonInheritedData->m_hasAspectRatio; }
748 float aspectRatio() const { return aspectRatioNumerator() / aspectRatioDenom inator(); } 748 float aspectRatio() const { return aspectRatioNumerator() / aspectRatioDenom inator(); }
749 float aspectRatioDenominator() const { return rareNonInheritedData->m_aspect RatioDenominator; } 749 float aspectRatioDenominator() const { return rareNonInheritedData->m_aspect RatioDenominator; }
750 float aspectRatioNumerator() const { return rareNonInheritedData->m_aspectRa tioNumerator; } 750 float aspectRatioNumerator() const { return rareNonInheritedData->m_aspectRa tioNumerator; }
751 EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonIn heritedData->m_deprecatedFlexibleBox->align); } 751 EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonIn heritedData->m_deprecatedFlexibleBox->align); }
752 EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(inher ited_flags._box_direction); } 752 EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(inher ited_flags._box_direction); }
753 float boxFlex() const { return rareNonInheritedData->m_deprecatedFlexibleBox ->flex; } 753 float boxFlex() const { return rareNonInheritedData->m_deprecatedFlexibleBox ->flex; }
754 unsigned int boxFlexGroup() const { return rareNonInheritedData->m_deprecate dFlexibleBox->flex_group; } 754 unsigned boxFlexGroup() const { return rareNonInheritedData->m_deprecatedFle xibleBox->flexGroup; }
755 EBoxLines boxLines() const { return static_cast<EBoxLines>(rareNonInheritedD ata->m_deprecatedFlexibleBox->lines); } 755 EBoxLines boxLines() const { return static_cast<EBoxLines>(rareNonInheritedD ata->m_deprecatedFlexibleBox->lines); }
756 unsigned int boxOrdinalGroup() const { return rareNonInheritedData->m_deprec atedFlexibleBox->ordinal_group; } 756 unsigned boxOrdinalGroup() const { return rareNonInheritedData->m_deprecated FlexibleBox->ordinalGroup; }
757 EBoxOrient boxOrient() const { return static_cast<EBoxOrient>(rareNonInherit edData->m_deprecatedFlexibleBox->orient); } 757 EBoxOrient boxOrient() const { return static_cast<EBoxOrient>(rareNonInherit edData->m_deprecatedFlexibleBox->orient); }
758 EBoxPack boxPack() const { return static_cast<EBoxPack>(rareNonInheritedData ->m_deprecatedFlexibleBox->pack); } 758 EBoxPack boxPack() const { return static_cast<EBoxPack>(rareNonInheritedData ->m_deprecatedFlexibleBox->pack); }
759 759
760 int order() const { return rareNonInheritedData->m_order; } 760 int order() const { return rareNonInheritedData->m_order; }
761 const Vector<String>& callbackSelectors() const { return rareNonInheritedDat a->m_callbackSelectors; } 761 const Vector<String>& callbackSelectors() const { return rareNonInheritedDat a->m_callbackSelectors; }
762 float flexGrow() const { return rareNonInheritedData->m_flexibleBox->m_flexG row; } 762 float flexGrow() const { return rareNonInheritedData->m_flexibleBox->m_flexG row; }
763 float flexShrink() const { return rareNonInheritedData->m_flexibleBox->m_fle xShrink; } 763 float flexShrink() const { return rareNonInheritedData->m_flexibleBox->m_fle xShrink; }
764 const Length& flexBasis() const { return rareNonInheritedData->m_flexibleBox ->m_flexBasis; } 764 const Length& flexBasis() const { return rareNonInheritedData->m_flexibleBox ->m_flexBasis; }
765 EAlignContent alignContent() const { return static_cast<EAlignContent>(rareN onInheritedData->m_alignContent); } 765 EAlignContent alignContent() const { return static_cast<EAlignContent>(rareN onInheritedData->m_alignContent); }
766 ItemPosition alignItems() const { return static_cast<ItemPosition>(rareNonIn heritedData->m_alignItems); } 766 ItemPosition alignItems() const { return static_cast<ItemPosition>(rareNonIn heritedData->m_alignItems); }
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 void setTextStrokeColor(const StyleColor& c) { SET_VAR(rareInheritedData, te xtStrokeColor, c); } 1233 void setTextStrokeColor(const StyleColor& c) { SET_VAR(rareInheritedData, te xtStrokeColor, c); }
1234 void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidt h, w); } 1234 void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidt h, w); }
1235 void setTextFillColor(const StyleColor& c) { SET_VAR(rareInheritedData, text FillColor, c); } 1235 void setTextFillColor(const StyleColor& c) { SET_VAR(rareInheritedData, text FillColor, c); }
1236 void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNo nInheritedData, opacity, v); } 1236 void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNo nInheritedData, opacity, v); }
1237 void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearan ce, a); } 1237 void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearan ce, a); }
1238 // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexb ox-20090723/#alignment 1238 // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexb ox-20090723/#alignment
1239 void setBoxAlign(EBoxAlignment a) { SET_VAR(rareNonInheritedData.access()->m _deprecatedFlexibleBox, align, a); } 1239 void setBoxAlign(EBoxAlignment a) { SET_VAR(rareNonInheritedData.access()->m _deprecatedFlexibleBox, align, a); }
1240 void setBoxDecorationBreak(EBoxDecorationBreak b) { SET_VAR(m_box, m_boxDeco rationBreak, b); } 1240 void setBoxDecorationBreak(EBoxDecorationBreak b) { SET_VAR(m_box, m_boxDeco rationBreak, b); }
1241 void setBoxDirection(EBoxDirection d) { inherited_flags._box_direction = d; } 1241 void setBoxDirection(EBoxDirection d) { inherited_flags._box_direction = d; }
1242 void setBoxFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_deprecat edFlexibleBox, flex, f); } 1242 void setBoxFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_deprecat edFlexibleBox, flex, f); }
1243 void setBoxFlexGroup(unsigned int fg) { SET_VAR(rareNonInheritedData.access( )->m_deprecatedFlexibleBox, flex_group, fg); } 1243 void setBoxFlexGroup(unsigned fg) { SET_VAR(rareNonInheritedData.access()->m _deprecatedFlexibleBox, flexGroup, fg); }
1244 void setBoxLines(EBoxLines l) { SET_VAR(rareNonInheritedData.access()->m_dep recatedFlexibleBox, lines, l); } 1244 void setBoxLines(EBoxLines l) { SET_VAR(rareNonInheritedData.access()->m_dep recatedFlexibleBox, lines, l); }
1245 void setBoxOrdinalGroup(unsigned int og) { SET_VAR(rareNonInheritedData.acce ss()->m_deprecatedFlexibleBox, ordinal_group, og); } 1245 void setBoxOrdinalGroup(unsigned og) { SET_VAR(rareNonInheritedData.access() ->m_deprecatedFlexibleBox, ordinalGroup, og); }
1246 void setBoxOrient(EBoxOrient o) { SET_VAR(rareNonInheritedData.access()->m_d eprecatedFlexibleBox, orient, o); } 1246 void setBoxOrient(EBoxOrient o) { SET_VAR(rareNonInheritedData.access()->m_d eprecatedFlexibleBox, orient, o); }
1247 void setBoxPack(EBoxPack p) { SET_VAR(rareNonInheritedData.access()->m_depre catedFlexibleBox, pack, p); } 1247 void setBoxPack(EBoxPack p) { SET_VAR(rareNonInheritedData.access()->m_depre catedFlexibleBox, pack, p); }
1248 void setBoxShadow(PassRefPtr<ShadowList>); 1248 void setBoxShadow(PassRefPtr<ShadowList>);
1249 void setBoxReflect(PassRefPtr<StyleReflection> reflect) { if (rareNonInherit edData->m_boxReflect != reflect) rareNonInheritedData.access()->m_boxReflect = r eflect; } 1249 void setBoxReflect(PassRefPtr<StyleReflection> reflect) { if (rareNonInherit edData->m_boxReflect != reflect) rareNonInheritedData.access()->m_boxReflect = r eflect; }
1250 void setBoxSizing(EBoxSizing s) { SET_VAR(m_box, m_boxSizing, s); } 1250 void setBoxSizing(EBoxSizing s) { SET_VAR(m_box, m_boxSizing, s); }
1251 void setFlexGrow(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibl eBox, m_flexGrow, f); } 1251 void setFlexGrow(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibl eBox, m_flexGrow, f); }
1252 void setFlexShrink(float f) { SET_VAR(rareNonInheritedData.access()->m_flexi bleBox, m_flexShrink, f); } 1252 void setFlexShrink(float f) { SET_VAR(rareNonInheritedData.access()->m_flexi bleBox, m_flexShrink, f); }
1253 void setFlexBasis(Length length) { SET_VAR(rareNonInheritedData.access()->m_ flexibleBox, m_flexBasis, length); } 1253 void setFlexBasis(Length length) { SET_VAR(rareNonInheritedData.access()->m_ flexibleBox, m_flexBasis, length); }
1254 // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set. 1254 // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set.
1255 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, max(std::numer ic_limits<int>::min() + 2, o)); } 1255 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, max(std::numer ic_limits<int>::min() + 2, o)); }
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1596 static float initialZoom() { return 1.0f; } 1596 static float initialZoom() { return 1.0f; }
1597 static int initialOutlineOffset() { return 0; } 1597 static int initialOutlineOffset() { return 0; }
1598 static float initialOpacity() { return 1.0f; } 1598 static float initialOpacity() { return 1.0f; }
1599 static EBoxAlignment initialBoxAlign() { return BSTRETCH; } 1599 static EBoxAlignment initialBoxAlign() { return BSTRETCH; }
1600 static EBoxDecorationBreak initialBoxDecorationBreak() { return DSLICE; } 1600 static EBoxDecorationBreak initialBoxDecorationBreak() { return DSLICE; }
1601 static EBoxDirection initialBoxDirection() { return BNORMAL; } 1601 static EBoxDirection initialBoxDirection() { return BNORMAL; }
1602 static EBoxLines initialBoxLines() { return SINGLE; } 1602 static EBoxLines initialBoxLines() { return SINGLE; }
1603 static EBoxOrient initialBoxOrient() { return HORIZONTAL; } 1603 static EBoxOrient initialBoxOrient() { return HORIZONTAL; }
1604 static EBoxPack initialBoxPack() { return Start; } 1604 static EBoxPack initialBoxPack() { return Start; }
1605 static float initialBoxFlex() { return 0.0f; } 1605 static float initialBoxFlex() { return 0.0f; }
1606 static unsigned int initialBoxFlexGroup() { return 1; } 1606 static unsigned initialBoxFlexGroup() { return 1; }
1607 static unsigned int initialBoxOrdinalGroup() { return 1; } 1607 static unsigned initialBoxOrdinalGroup() { return 1; }
1608 static EBoxSizing initialBoxSizing() { return CONTENT_BOX; } 1608 static EBoxSizing initialBoxSizing() { return CONTENT_BOX; }
1609 static StyleReflection* initialBoxReflect() { return 0; } 1609 static StyleReflection* initialBoxReflect() { return 0; }
1610 static float initialFlexGrow() { return 0; } 1610 static float initialFlexGrow() { return 0; }
1611 static float initialFlexShrink() { return 1; } 1611 static float initialFlexShrink() { return 1; }
1612 static Length initialFlexBasis() { return Length(Auto); } 1612 static Length initialFlexBasis() { return Length(Auto); }
1613 static int initialOrder() { return 0; } 1613 static int initialOrder() { return 0; }
1614 static EAlignContent initialAlignContent() { return AlignContentStretch; } 1614 static EAlignContent initialAlignContent() { return AlignContentStretch; }
1615 static ItemPosition initialAlignItems() { return ItemPositionStretch; } 1615 static ItemPosition initialAlignItems() { return ItemPositionStretch; }
1616 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; } 1616 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; }
1617 static ItemPosition initialAlignSelf() { return ItemPositionAuto; } 1617 static ItemPosition initialAlignSelf() { return ItemPositionAuto; }
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
1885 inline bool RenderStyle::hasPseudoElementStyle() const 1885 inline bool RenderStyle::hasPseudoElementStyle() const
1886 { 1886 {
1887 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1887 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1888 } 1888 }
1889 1889
1890 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1890 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1891 1891
1892 } // namespace WebCore 1892 } // namespace WebCore
1893 1893
1894 #endif // RenderStyle_h 1894 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/style/StyleDeprecatedFlexibleBoxData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698