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

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

Issue 430333002: Do not expose auto as value of widows (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Set initial to 1 Created 6 years 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 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 const Length& paddingEnd() const { return surround->padding.end(writingMode( ), direction()); } 682 const Length& paddingEnd() const { return surround->padding.end(writingMode( ), direction()); }
683 683
684 ECursor cursor() const { return static_cast<ECursor>(inherited_flags._cursor _style); } 684 ECursor cursor() const { return static_cast<ECursor>(inherited_flags._cursor _style); }
685 CursorList* cursors() const { return rareInheritedData->cursorData.get(); } 685 CursorList* cursors() const { return rareInheritedData->cursorData.get(); }
686 686
687 EInsideLink insideLink() const { return static_cast<EInsideLink>(inherited_f lags._insideLink); } 687 EInsideLink insideLink() const { return static_cast<EInsideLink>(inherited_f lags._insideLink); }
688 bool isLink() const { return noninherited_flags.isLink; } 688 bool isLink() const { return noninherited_flags.isLink; }
689 689
690 short widows() const { return rareInheritedData->widows; } 690 short widows() const { return rareInheritedData->widows; }
691 short orphans() const { return rareInheritedData->orphans; } 691 short orphans() const { return rareInheritedData->orphans; }
692 bool hasAutoWidows() const { return rareInheritedData->m_hasAutoWidows; } 692 bool hasAutoWidows() const { return rareInheritedData->widows == 1; }
693 bool hasAutoOrphans() const { return rareInheritedData->m_hasAutoOrphans; } 693 bool hasAutoOrphans() const { return rareInheritedData->m_hasAutoOrphans; }
694 EPageBreak pageBreakInside() const { return static_cast<EPageBreak>(noninher ited_flags.pageBreakInside); } 694 EPageBreak pageBreakInside() const { return static_cast<EPageBreak>(noninher ited_flags.pageBreakInside); }
695 EPageBreak pageBreakBefore() const { return static_cast<EPageBreak>(noninher ited_flags.pageBreakBefore); } 695 EPageBreak pageBreakBefore() const { return static_cast<EPageBreak>(noninher ited_flags.pageBreakBefore); }
696 EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninheri ted_flags.pageBreakAfter); } 696 EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninheri ted_flags.pageBreakAfter); }
697 697
698 // CSS3 Getter Methods 698 // CSS3 Getter Methods
699 699
700 int outlineOffset() const 700 int outlineOffset() const
701 { 701 {
702 if (m_background->outline().style() == BNONE) 702 if (m_background->outline().style() == BNONE)
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 void setIsLink(bool b) { noninherited_flags.isLink = b; } 1168 void setIsLink(bool b) { noninherited_flags.isLink = b; }
1169 1169
1170 PrintColorAdjust printColorAdjust() const { return static_cast<PrintColorAdj ust>(inherited_flags.m_printColorAdjust); } 1170 PrintColorAdjust printColorAdjust() const { return static_cast<PrintColorAdj ust>(inherited_flags.m_printColorAdjust); }
1171 void setPrintColorAdjust(PrintColorAdjust value) { inherited_flags.m_printCo lorAdjust = value; } 1171 void setPrintColorAdjust(PrintColorAdjust value) { inherited_flags.m_printCo lorAdjust = value; }
1172 1172
1173 bool hasAutoZIndex() const { return m_box->hasAutoZIndex(); } 1173 bool hasAutoZIndex() const { return m_box->hasAutoZIndex(); }
1174 void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_b ox, m_zIndex, 0); } 1174 void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_b ox, m_zIndex, 0); }
1175 int zIndex() const { return m_box->zIndex(); } 1175 int zIndex() const { return m_box->zIndex(); }
1176 void setZIndex(int v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR(m_bo x, m_zIndex, v); } 1176 void setZIndex(int v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR(m_bo x, m_zIndex, v); }
1177 1177
1178 void setHasAutoWidows() { SET_VAR(rareInheritedData, m_hasAutoWidows, true); SET_VAR(rareInheritedData, widows, initialWidows()); } 1178 void setHasAutoWidows() { SET_VAR(rareInheritedData, widows, initialWidows() ); }
1179 void setWidows(short w) { SET_VAR(rareInheritedData, m_hasAutoWidows, false) ; SET_VAR(rareInheritedData, widows, w); } 1179 void setWidows(short w) { SET_VAR(rareInheritedData, widows, w); }
1180 1180
1181 void setHasAutoOrphans() { SET_VAR(rareInheritedData, m_hasAutoOrphans, true ); SET_VAR(rareInheritedData, orphans, initialOrphans()); } 1181 void setHasAutoOrphans() { SET_VAR(rareInheritedData, m_hasAutoOrphans, true ); SET_VAR(rareInheritedData, orphans, initialOrphans()); }
1182 void setOrphans(short o) { SET_VAR(rareInheritedData, m_hasAutoOrphans, fals e); SET_VAR(rareInheritedData, orphans, o); } 1182 void setOrphans(short o) { SET_VAR(rareInheritedData, m_hasAutoOrphans, fals e); SET_VAR(rareInheritedData, orphans, o); }
1183 1183
1184 // For valid values of page-break-inside see http://www.w3.org/TR/CSS21/page .html#page-break-props 1184 // For valid values of page-break-inside see http://www.w3.org/TR/CSS21/page .html#page-break-props
1185 void setPageBreakInside(EPageBreak b) { ASSERT(b == PBAUTO || b == PBAVOID); noninherited_flags.pageBreakInside = b; } 1185 void setPageBreakInside(EPageBreak b) { ASSERT(b == PBAUTO || b == PBAVOID); noninherited_flags.pageBreakInside = b; }
1186 void setPageBreakBefore(EPageBreak b) { noninherited_flags.pageBreakBefore = b; } 1186 void setPageBreakBefore(EPageBreak b) { noninherited_flags.pageBreakBefore = b; }
1187 void setPageBreakAfter(EPageBreak b) { noninherited_flags.pageBreakAfter = b ; } 1187 void setPageBreakAfter(EPageBreak b) { noninherited_flags.pageBreakAfter = b ; }
1188 1188
1189 // CSS3 Setters 1189 // CSS3 Setters
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1511 static Length initialSize() { return Length(); } 1511 static Length initialSize() { return Length(); }
1512 static Length initialMinSize() { return Length(Fixed); } 1512 static Length initialMinSize() { return Length(Fixed); }
1513 static Length initialMaxSize() { return Length(MaxSizeNone); } 1513 static Length initialMaxSize() { return Length(MaxSizeNone); }
1514 static Length initialOffset() { return Length(); } 1514 static Length initialOffset() { return Length(); }
1515 static Length initialMargin() { return Length(Fixed); } 1515 static Length initialMargin() { return Length(Fixed); }
1516 static Length initialPadding() { return Length(Fixed); } 1516 static Length initialPadding() { return Length(Fixed); }
1517 static Length initialTextIndent() { return Length(Fixed); } 1517 static Length initialTextIndent() { return Length(Fixed); }
1518 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; } 1518 static TextIndentLine initialTextIndentLine() { return TextIndentFirstLine; }
1519 static TextIndentType initialTextIndentType() { return TextIndentNormal; } 1519 static TextIndentType initialTextIndentType() { return TextIndentNormal; }
1520 static EVerticalAlign initialVerticalAlign() { return BASELINE; } 1520 static EVerticalAlign initialVerticalAlign() { return BASELINE; }
1521 static short initialWidows() { return 2; } 1521 static short initialWidows() { return 1; }
1522 static short initialOrphans() { return 2; } 1522 static short initialOrphans() { return 2; }
1523 static Length initialLineHeight() { return Length(-100.0, Percent); } 1523 static Length initialLineHeight() { return Length(-100.0, Percent); }
1524 static ETextAlign initialTextAlign() { return TASTART; } 1524 static ETextAlign initialTextAlign() { return TASTART; }
1525 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; } 1525 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
1526 static TextJustify initialTextJustify() { return TextJustifyAuto; } 1526 static TextJustify initialTextJustify() { return TextJustifyAuto; }
1527 static TextDecoration initialTextDecoration() { return TextDecorationNone; } 1527 static TextDecoration initialTextDecoration() { return TextDecorationNone; }
1528 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; } 1528 static TextUnderlinePosition initialTextUnderlinePosition() { return TextUnd erlinePositionAuto; }
1529 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; } 1529 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorat ionStyleSolid; }
1530 static float initialZoom() { return 1.0f; } 1530 static float initialZoom() { return 1.0f; }
1531 static int initialOutlineOffset() { return 0; } 1531 static int initialOutlineOffset() { return 0; }
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 inline bool RenderStyle::hasPseudoElementStyle() const 1856 inline bool RenderStyle::hasPseudoElementStyle() const
1857 { 1857 {
1858 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1858 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1859 } 1859 }
1860 1860
1861 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1861 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1862 1862
1863 } // namespace blink 1863 } // namespace blink
1864 1864
1865 #endif // RenderStyle_h 1865 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/style/StyleRareInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698