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

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

Issue 639293008: Make CSS resize property non-inherited. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: New baselines 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
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/rendering/style/StyleRareInheritedData.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); } 824 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); }
825 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon InheritedData->textOverflow); } 825 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon InheritedData->textOverflow); }
826 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol lapse>(rareNonInheritedData->marginBeforeCollapse); } 826 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol lapse>(rareNonInheritedData->marginBeforeCollapse); }
827 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl apse>(rareNonInheritedData->marginAfterCollapse); } 827 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl apse>(rareNonInheritedData->marginAfterCollapse); }
828 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); } 828 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); }
829 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); } 829 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); }
830 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat a->lineBreak); } 830 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat a->lineBreak); }
831 const AtomicString& highlight() const { return rareInheritedData->highlight; } 831 const AtomicString& highlight() const { return rareInheritedData->highlight; }
832 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; } 832 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; }
833 const AtomicString& locale() const { return rareInheritedData->locale; } 833 const AtomicString& locale() const { return rareInheritedData->locale; }
834 EResize resize() const { return static_cast<EResize>(rareInheritedData->resi ze); } 834 EResize resize() const { return static_cast<EResize>(rareNonInheritedData->m _resize); }
835 bool hasInlinePaginationAxis() const 835 bool hasInlinePaginationAxis() const
836 { 836 {
837 // If the pagination axis is parallel with the writing mode inline axis, columns may be laid 837 // If the pagination axis is parallel with the writing mode inline axis, columns may be laid
838 // out along the inline axis, just like for regular multicol. Otherwise, we need to lay out 838 // out along the inline axis, just like for regular multicol. Otherwise, we need to lay out
839 // along the block axis. 839 // along the block axis.
840 if (isOverflowPaged()) 840 if (isOverflowPaged())
841 return (overflowY() == OPAGEDX) == isHorizontalWritingMode(); 841 return (overflowY() == OPAGEDX) == isHorizontalWritingMode();
842 return false; 842 return false;
843 } 843 }
844 float columnWidth() const { return rareNonInheritedData->m_multiCol->m_width ; } 844 float columnWidth() const { return rareNonInheritedData->m_multiCol->m_width ; }
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); } 1308 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); }
1309 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa ta, marginBeforeCollapse, c); } 1309 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa ta, marginBeforeCollapse, c); }
1310 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat a, marginAfterCollapse, c); } 1310 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat a, marginAfterCollapse, c); }
1311 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); } 1311 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); }
1312 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); } 1312 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); }
1313 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } 1313 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); }
1314 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli ght, h); } 1314 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli ght, h); }
1315 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); } 1315 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
1316 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); } 1316 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); }
1317 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca le, locale); } 1317 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca le, locale); }
1318 void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); } 1318 void setResize(EResize r) { SET_VAR(rareNonInheritedData, m_resize, r); }
1319 void setColumnWidth(float f) { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ width, f); } 1319 void setColumnWidth(float f) { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ width, f); }
1320 void setHasAutoColumnWidth() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_w idth, 0); } 1320 void setHasAutoColumnWidth() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_w idth, 0); }
1321 void setColumnCount(unsigned short c) { SET_VAR(rareNonInheritedData.access( )->m_multiCol, m_autoCount, false); SET_VAR(rareNonInheritedData.access()->m_mul tiCol, m_count, c); } 1321 void setColumnCount(unsigned short c) { SET_VAR(rareNonInheritedData.access( )->m_multiCol, m_autoCount, false); SET_VAR(rareNonInheritedData.access()->m_mul tiCol, m_count, c); }
1322 void setHasAutoColumnCount() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoCount, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_c ount, 0); } 1322 void setHasAutoColumnCount() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoCount, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_c ount, 0); }
1323 void setColumnFill(ColumnFill columnFill) { SET_VAR(rareNonInheritedData.acc ess()->m_multiCol, m_fill, columnFill); } 1323 void setColumnFill(ColumnFill columnFill) { SET_VAR(rareNonInheritedData.acc ess()->m_multiCol, m_fill, columnFill); }
1324 void setColumnGap(float f) { SET_VAR(rareNonInheritedData.access()->m_multiC ol, m_normalGap, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ga p, f); } 1324 void setColumnGap(float f) { SET_VAR(rareNonInheritedData.access()->m_multiC ol, m_normalGap, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ga p, f); }
1325 void setHasNormalColumnGap() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_normalGap, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_g ap, 0); } 1325 void setHasNormalColumnGap() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_normalGap, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_g ap, 0); }
1326 void setColumnRuleColor(const StyleColor& c) { SET_BORDERVALUE_COLOR(rareNon InheritedData.access()->m_multiCol, m_rule, c); } 1326 void setColumnRuleColor(const StyleColor& c) { SET_BORDERVALUE_COLOR(rareNon InheritedData.access()->m_multiCol, m_rule, c); }
1327 void setColumnRuleStyle(EBorderStyle b) { SET_VAR(rareNonInheritedData.acces s()->m_multiCol, m_rule.m_style, b); } 1327 void setColumnRuleStyle(EBorderStyle b) { SET_VAR(rareNonInheritedData.acces s()->m_multiCol, m_rule.m_style, b); }
1328 void setColumnRuleWidth(unsigned short w) { SET_VAR(rareNonInheritedData.acc ess()->m_multiCol, m_rule.m_width, w); } 1328 void setColumnRuleWidth(unsigned short w) { SET_VAR(rareNonInheritedData.acc ess()->m_multiCol, m_rule.m_width, w); }
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
1918 inline bool RenderStyle::hasPseudoElementStyle() const 1918 inline bool RenderStyle::hasPseudoElementStyle() const
1919 { 1919 {
1920 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1920 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1921 } 1921 }
1922 1922
1923 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1923 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1924 1924
1925 } // namespace blink 1925 } // namespace blink
1926 1926
1927 #endif // RenderStyle_h 1927 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/rendering/style/StyleRareInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698