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

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

Issue 25687002: Add support for the column-fill property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Put changes to problematic files (for the bots) back in. Created 7 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 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 ColumnAxis axis = columnAxis(); 794 ColumnAxis axis = columnAxis();
795 return axis == AutoColumnAxis || isHorizontalWritingMode() == (axis == H orizontalColumnAxis); 795 return axis == AutoColumnAxis || isHorizontalWritingMode() == (axis == H orizontalColumnAxis);
796 } 796 }
797 ColumnProgression columnProgression() const { return static_cast<ColumnProgr ession>(rareNonInheritedData->m_multiCol->m_progression); } 797 ColumnProgression columnProgression() const { return static_cast<ColumnProgr ession>(rareNonInheritedData->m_multiCol->m_progression); }
798 float columnWidth() const { return rareNonInheritedData->m_multiCol->m_width ; } 798 float columnWidth() const { return rareNonInheritedData->m_multiCol->m_width ; }
799 bool hasAutoColumnWidth() const { return rareNonInheritedData->m_multiCol->m _autoWidth; } 799 bool hasAutoColumnWidth() const { return rareNonInheritedData->m_multiCol->m _autoWidth; }
800 unsigned short columnCount() const { return rareNonInheritedData->m_multiCol ->m_count; } 800 unsigned short columnCount() const { return rareNonInheritedData->m_multiCol ->m_count; }
801 bool hasAutoColumnCount() const { return rareNonInheritedData->m_multiCol->m _autoCount; } 801 bool hasAutoColumnCount() const { return rareNonInheritedData->m_multiCol->m _autoCount; }
802 bool specifiesAutoColumns() const { return hasAutoColumnCount() && hasAutoCo lumnWidth(); } 802 bool specifiesAutoColumns() const { return hasAutoColumnCount() && hasAutoCo lumnWidth(); }
803 bool specifiesColumns() const { return !hasAutoColumnCount() || !hasAutoColu mnWidth() || !hasInlineColumnAxis(); } 803 bool specifiesColumns() const { return !hasAutoColumnCount() || !hasAutoColu mnWidth() || !hasInlineColumnAxis(); }
804 ColumnFill columnFill() const { return static_cast<ColumnFill>(rareNonInheri tedData->m_multiCol->m_fill); }
804 float columnGap() const { return rareNonInheritedData->m_multiCol->m_gap; } 805 float columnGap() const { return rareNonInheritedData->m_multiCol->m_gap; }
805 bool hasNormalColumnGap() const { return rareNonInheritedData->m_multiCol->m _normalGap; } 806 bool hasNormalColumnGap() const { return rareNonInheritedData->m_multiCol->m _normalGap; }
806 EBorderStyle columnRuleStyle() const { return rareNonInheritedData->m_multiC ol->m_rule.style(); } 807 EBorderStyle columnRuleStyle() const { return rareNonInheritedData->m_multiC ol->m_rule.style(); }
807 unsigned short columnRuleWidth() const { return rareNonInheritedData->m_mult iCol->ruleWidth(); } 808 unsigned short columnRuleWidth() const { return rareNonInheritedData->m_mult iCol->ruleWidth(); }
808 bool columnRuleIsTransparent() const { return rareNonInheritedData->m_multiC ol->m_rule.isTransparent(); } 809 bool columnRuleIsTransparent() const { return rareNonInheritedData->m_multiC ol->m_rule.isTransparent(); }
809 ColumnSpan columnSpan() const { return static_cast<ColumnSpan>(rareNonInheri tedData->m_multiCol->m_columnSpan); } 810 ColumnSpan columnSpan() const { return static_cast<ColumnSpan>(rareNonInheri tedData->m_multiCol->m_columnSpan); }
810 EPageBreak columnBreakBefore() const { return static_cast<EPageBreak>(rareNo nInheritedData->m_multiCol->m_breakBefore); } 811 EPageBreak columnBreakBefore() const { return static_cast<EPageBreak>(rareNo nInheritedData->m_multiCol->m_breakBefore); }
811 EPageBreak columnBreakInside() const { return static_cast<EPageBreak>(rareNo nInheritedData->m_multiCol->m_breakInside); } 812 EPageBreak columnBreakInside() const { return static_cast<EPageBreak>(rareNo nInheritedData->m_multiCol->m_breakInside); }
812 EPageBreak columnBreakAfter() const { return static_cast<EPageBreak>(rareNon InheritedData->m_multiCol->m_breakAfter); } 813 EPageBreak columnBreakAfter() const { return static_cast<EPageBreak>(rareNon InheritedData->m_multiCol->m_breakAfter); }
813 EPageBreak regionBreakBefore() const { return static_cast<EPageBreak>(rareNo nInheritedData->m_regionBreakBefore); } 814 EPageBreak regionBreakBefore() const { return static_cast<EPageBreak>(rareNo nInheritedData->m_regionBreakBefore); }
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); } 1234 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); }
1234 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca le, locale); } 1235 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca le, locale); }
1235 void setBorderFit(EBorderFit b) { SET_VAR(rareNonInheritedData, m_borderFit, b); } 1236 void setBorderFit(EBorderFit b) { SET_VAR(rareNonInheritedData, m_borderFit, b); }
1236 void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); } 1237 void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); }
1237 void setColumnAxis(ColumnAxis axis) { SET_VAR(rareNonInheritedData.access()- >m_multiCol, m_axis, axis); } 1238 void setColumnAxis(ColumnAxis axis) { SET_VAR(rareNonInheritedData.access()- >m_multiCol, m_axis, axis); }
1238 void setColumnProgression(ColumnProgression progression) { SET_VAR(rareNonIn heritedData.access()->m_multiCol, m_progression, progression); } 1239 void setColumnProgression(ColumnProgression progression) { SET_VAR(rareNonIn heritedData.access()->m_multiCol, m_progression, progression); }
1239 void setColumnWidth(float f) { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ width, f); } 1240 void setColumnWidth(float f) { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ width, f); }
1240 void setHasAutoColumnWidth() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_w idth, 0); } 1241 void setHasAutoColumnWidth() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_w idth, 0); }
1241 void setColumnCount(unsigned short c) { SET_VAR(rareNonInheritedData.access( )->m_multiCol, m_autoCount, false); SET_VAR(rareNonInheritedData.access()->m_mul tiCol, m_count, c); } 1242 void setColumnCount(unsigned short c) { SET_VAR(rareNonInheritedData.access( )->m_multiCol, m_autoCount, false); SET_VAR(rareNonInheritedData.access()->m_mul tiCol, m_count, c); }
1242 void setHasAutoColumnCount() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoCount, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_c ount, 0); } 1243 void setHasAutoColumnCount() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoCount, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_c ount, 0); }
1244 void setColumnFill(ColumnFill columnFill) { SET_VAR(rareNonInheritedData.acc ess()->m_multiCol, m_fill, columnFill); }
1243 void setColumnGap(float f) { SET_VAR(rareNonInheritedData.access()->m_multiC ol, m_normalGap, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ga p, f); } 1245 void setColumnGap(float f) { SET_VAR(rareNonInheritedData.access()->m_multiC ol, m_normalGap, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ga p, f); }
1244 void setHasNormalColumnGap() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_normalGap, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_g ap, 0); } 1246 void setHasNormalColumnGap() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_normalGap, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_g ap, 0); }
1245 void setColumnRuleColor(const Color& c) { SET_BORDERVALUE_COLOR(rareNonInher itedData.access()->m_multiCol, m_rule, c); } 1247 void setColumnRuleColor(const Color& c) { SET_BORDERVALUE_COLOR(rareNonInher itedData.access()->m_multiCol, m_rule, c); }
1246 void setColumnRuleStyle(EBorderStyle b) { SET_VAR(rareNonInheritedData.acces s()->m_multiCol, m_rule.m_style, b); } 1248 void setColumnRuleStyle(EBorderStyle b) { SET_VAR(rareNonInheritedData.acces s()->m_multiCol, m_rule.m_style, b); }
1247 void setColumnRuleWidth(unsigned short w) { SET_VAR(rareNonInheritedData.acc ess()->m_multiCol, m_rule.m_width, w); } 1249 void setColumnRuleWidth(unsigned short w) { SET_VAR(rareNonInheritedData.acc ess()->m_multiCol, m_rule.m_width, w); }
1248 void resetColumnRule() { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_rule, BorderValue()); } 1250 void resetColumnRule() { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_rule, BorderValue()); }
1249 void setColumnSpan(ColumnSpan columnSpan) { SET_VAR(rareNonInheritedData.acc ess()->m_multiCol, m_columnSpan, columnSpan); } 1251 void setColumnSpan(ColumnSpan columnSpan) { SET_VAR(rareNonInheritedData.acc ess()->m_multiCol, m_columnSpan, columnSpan); }
1250 void setColumnBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData.acces s()->m_multiCol, m_breakBefore, p); } 1252 void setColumnBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData.acces s()->m_multiCol, m_breakBefore, p); }
1251 // For valid values of column-break-inside see http://www.w3.org/TR/css3-mul ticol/#break-before-break-after-break-inside 1253 // For valid values of column-break-inside see http://www.w3.org/TR/css3-mul ticol/#break-before-break-after-break-inside
1252 void setColumnBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID ); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); } 1254 void setColumnBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID ); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); }
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 static const AtomicString& initialLocale() { return nullAtom; } 1578 static const AtomicString& initialLocale() { return nullAtom; }
1577 static EBorderFit initialBorderFit() { return BorderFitBorder; } 1579 static EBorderFit initialBorderFit() { return BorderFitBorder; }
1578 static EResize initialResize() { return RESIZE_NONE; } 1580 static EResize initialResize() { return RESIZE_NONE; }
1579 static ControlPart initialAppearance() { return NoControlPart; } 1581 static ControlPart initialAppearance() { return NoControlPart; }
1580 static bool initialHasAspectRatio() { return false; } 1582 static bool initialHasAspectRatio() { return false; }
1581 static float initialAspectRatioDenominator() { return 1; } 1583 static float initialAspectRatioDenominator() { return 1; }
1582 static float initialAspectRatioNumerator() { return 1; } 1584 static float initialAspectRatioNumerator() { return 1; }
1583 static Order initialRTLOrdering() { return LogicalOrder; } 1585 static Order initialRTLOrdering() { return LogicalOrder; }
1584 static float initialTextStrokeWidth() { return 0; } 1586 static float initialTextStrokeWidth() { return 0; }
1585 static unsigned short initialColumnCount() { return 1; } 1587 static unsigned short initialColumnCount() { return 1; }
1588 static ColumnFill initialColumnFill() { return ColumnFillBalance; }
1586 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; } 1589 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; }
1587 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T ransformOperations, ops, ()); return ops; } 1590 static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(T ransformOperations, ops, ()); return ops; }
1588 static Length initialTransformOriginX() { return Length(50.0, Percent); } 1591 static Length initialTransformOriginX() { return Length(50.0, Percent); }
1589 static Length initialTransformOriginY() { return Length(50.0, Percent); } 1592 static Length initialTransformOriginY() { return Length(50.0, Percent); }
1590 static EPointerEvents initialPointerEvents() { return PE_AUTO; } 1593 static EPointerEvents initialPointerEvents() { return PE_AUTO; }
1591 static float initialTransformOriginZ() { return 0; } 1594 static float initialTransformOriginZ() { return 0; }
1592 static ETransformStyle3D initialTransformStyle3D() { return TransformStyle3D Flat; } 1595 static ETransformStyle3D initialTransformStyle3D() { return TransformStyle3D Flat; }
1593 static EBackfaceVisibility initialBackfaceVisibility() { return BackfaceVisi bilityVisible; } 1596 static EBackfaceVisibility initialBackfaceVisibility() { return BackfaceVisi bilityVisible; }
1594 static float initialPerspective() { return 0; } 1597 static float initialPerspective() { return 0; }
1595 static Length initialPerspectiveOriginX() { return Length(50.0, Percent); } 1598 static Length initialPerspectiveOriginX() { return Length(50.0, Percent); }
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1782 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1785 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1783 return false; 1786 return false;
1784 1787
1785 rareInheritedData.access()->m_textOrientation = textOrientation; 1788 rareInheritedData.access()->m_textOrientation = textOrientation;
1786 return true; 1789 return true;
1787 } 1790 }
1788 1791
1789 } // namespace WebCore 1792 } // namespace WebCore
1790 1793
1791 #endif // RenderStyle_h 1794 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMultiColumnBlock.h ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698