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

Side by Side Diff: sky/engine/core/rendering/style/RenderStyle.h

Issue 1068073002: drop 'orphan' property (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fix ojan's comments Created 5 years, 8 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 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 const Length& paddingAfter() const { return surround->padding.after(); } 591 const Length& paddingAfter() const { return surround->padding.after(); }
592 const Length& paddingStart() const { return surround->padding.start(directio n()); } 592 const Length& paddingStart() const { return surround->padding.start(directio n()); }
593 const Length& paddingEnd() const { return surround->padding.end(direction()) ; } 593 const Length& paddingEnd() const { return surround->padding.end(direction()) ; }
594 594
595 ECursor cursor() const { return static_cast<ECursor>(inherited_flags._cursor _style); } 595 ECursor cursor() const { return static_cast<ECursor>(inherited_flags._cursor _style); }
596 CursorList* cursors() const { return rareInheritedData->cursorData.get(); } 596 CursorList* cursors() const { return rareInheritedData->cursorData.get(); }
597 597
598 bool isLink() const { return noninherited_flags.isLink; } 598 bool isLink() const { return noninherited_flags.isLink; }
599 599
600 short widows() const { return rareInheritedData->widows; } 600 short widows() const { return rareInheritedData->widows; }
601 short orphans() const { return rareInheritedData->orphans; }
602 bool hasAutoWidows() const { return rareInheritedData->m_hasAutoWidows; } 601 bool hasAutoWidows() const { return rareInheritedData->m_hasAutoWidows; }
603 bool hasAutoOrphans() const { return rareInheritedData->m_hasAutoOrphans; }
604 EPageBreak pageBreakInside() const { return static_cast<EPageBreak>(noninher ited_flags.pageBreakInside); } 602 EPageBreak pageBreakInside() const { return static_cast<EPageBreak>(noninher ited_flags.pageBreakInside); }
605 EPageBreak pageBreakBefore() const { return static_cast<EPageBreak>(noninher ited_flags.pageBreakBefore); } 603 EPageBreak pageBreakBefore() const { return static_cast<EPageBreak>(noninher ited_flags.pageBreakBefore); }
606 EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninheri ted_flags.pageBreakAfter); } 604 EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninheri ted_flags.pageBreakAfter); }
607 605
608 // CSS3 Getter Methods 606 // CSS3 Getter Methods
609 607
610 int outlineOffset() const 608 int outlineOffset() const
611 { 609 {
612 if (m_background->outline().style() == BNONE) 610 if (m_background->outline().style() == BNONE)
613 return 0; 611 return 0;
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 void setIsLink(bool b) { noninherited_flags.isLink = b; } 935 void setIsLink(bool b) { noninherited_flags.isLink = b; }
938 936
939 bool hasAutoZIndex() const { return m_box->hasAutoZIndex(); } 937 bool hasAutoZIndex() const { return m_box->hasAutoZIndex(); }
940 void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_b ox, m_zIndex, 0); } 938 void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_b ox, m_zIndex, 0); }
941 unsigned zIndex() const { return m_box->zIndex(); } 939 unsigned zIndex() const { return m_box->zIndex(); }
942 void setZIndex(unsigned v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR (m_box, m_zIndex, v); } 940 void setZIndex(unsigned v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR (m_box, m_zIndex, v); }
943 941
944 void setHasAutoWidows() { SET_VAR(rareInheritedData, m_hasAutoWidows, true); SET_VAR(rareInheritedData, widows, initialWidows()); } 942 void setHasAutoWidows() { SET_VAR(rareInheritedData, m_hasAutoWidows, true); SET_VAR(rareInheritedData, widows, initialWidows()); }
945 void setWidows(short w) { SET_VAR(rareInheritedData, m_hasAutoWidows, false) ; SET_VAR(rareInheritedData, widows, w); } 943 void setWidows(short w) { SET_VAR(rareInheritedData, m_hasAutoWidows, false) ; SET_VAR(rareInheritedData, widows, w); }
946 944
947 void setHasAutoOrphans() { SET_VAR(rareInheritedData, m_hasAutoOrphans, true ); SET_VAR(rareInheritedData, orphans, initialOrphans()); }
948 void setOrphans(short o) { SET_VAR(rareInheritedData, m_hasAutoOrphans, fals e); SET_VAR(rareInheritedData, orphans, o); }
949
950 // For valid values of page-break-inside see http://www.w3.org/TR/CSS21/page .html#page-break-props 945 // For valid values of page-break-inside see http://www.w3.org/TR/CSS21/page .html#page-break-props
951 void setPageBreakInside(EPageBreak b) { ASSERT(b == PBAUTO || b == PBAVOID); noninherited_flags.pageBreakInside = b; } 946 void setPageBreakInside(EPageBreak b) { ASSERT(b == PBAUTO || b == PBAVOID); noninherited_flags.pageBreakInside = b; }
952 void setPageBreakBefore(EPageBreak b) { noninherited_flags.pageBreakBefore = b; } 947 void setPageBreakBefore(EPageBreak b) { noninherited_flags.pageBreakBefore = b; }
953 void setPageBreakAfter(EPageBreak b) { noninherited_flags.pageBreakAfter = b ; } 948 void setPageBreakAfter(EPageBreak b) { noninherited_flags.pageBreakAfter = b ; }
954 949
955 // CSS3 Setters 950 // CSS3 Setters
956 void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); } 951 void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); }
957 void setTextShadow(PassRefPtr<ShadowList>); 952 void setTextShadow(PassRefPtr<ShadowList>);
958 void setTextStrokeColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInher itedData, textStrokeColor, setTextStrokeColor, c); } 953 void setTextStrokeColor(const StyleColor& c) { SET_VAR_WITH_SETTER(rareInher itedData, textStrokeColor, setTextStrokeColor, c); }
959 void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidt h, w); } 954 void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidt h, w); }
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 static Length initialMinSize() { return Length(Fixed); } 1131 static Length initialMinSize() { return Length(Fixed); }
1137 static Length initialMaxSize() { return Length(MaxSizeNone); } 1132 static Length initialMaxSize() { return Length(MaxSizeNone); }
1138 static Length initialOffset() { return Length(); } 1133 static Length initialOffset() { return Length(); }
1139 static Length initialMargin() { return Length(Fixed); } 1134 static Length initialMargin() { return Length(Fixed); }
1140 static Length initialPadding() { return Length(Fixed); } 1135 static Length initialPadding() { return Length(Fixed); }
1141 static Length initialTextIndent() { return Length(Fixed); } 1136 static Length initialTextIndent() { return Length(Fixed); }
1142 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; } 1137 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; }
1143 static TextIndentType initialTextIndentType() { return TextIndentNormal; } 1138 static TextIndentType initialTextIndentType() { return TextIndentNormal; }
1144 static EVerticalAlign initialVerticalAlign() { return BASELINE; } 1139 static EVerticalAlign initialVerticalAlign() { return BASELINE; }
1145 static short initialWidows() { return 2; } 1140 static short initialWidows() { return 2; }
1146 static short initialOrphans() { return 2; }
1147 static Length initialLineHeight() { return Length(-100.0, Percent); } 1141 static Length initialLineHeight() { return Length(-100.0, Percent); }
1148 static ETextAlign initialTextAlign() { return TASTART; } 1142 static ETextAlign initialTextAlign() { return TASTART; }
1149 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; } 1143 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
1150 static TextJustify initialTextJustify() { return TextJustifyAuto; } 1144 static TextJustify initialTextJustify() { return TextJustifyAuto; }
1151 static TextDecoration initialTextDecoration() { return TextDecorationNone; } 1145 static TextDecoration initialTextDecoration() { return TextDecorationNone; }
1152 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; } 1146 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; }
1153 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; } 1147 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; }
1154 static int initialOutlineOffset() { return 0; } 1148 static int initialOutlineOffset() { return 0; }
1155 static float initialOpacity() { return 1.0f; } 1149 static float initialOpacity() { return 1.0f; }
1156 static EBoxAlignment initialBoxAlign() { return BSTRETCH; } 1150 static EBoxAlignment initialBoxAlign() { return BSTRETCH; }
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 1296
1303 rareInheritedData.access()->m_textOrientation = textOrientation; 1297 rareInheritedData.access()->m_textOrientation = textOrientation;
1304 return true; 1298 return true;
1305 } 1299 }
1306 1300
1307 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1301 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1308 1302
1309 } // namespace blink 1303 } // namespace blink
1310 1304
1311 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_ 1305 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_
OLDNEW
« no previous file with comments | « sky/engine/core/editing/EditingStyle.cpp ('k') | sky/engine/core/rendering/style/StyleRareInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698