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

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

Issue 20526006: Remove -webkit-hyphens and -webkit-hyphenate-limit-* properties. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: init removal Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderText.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('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 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit edData->userModify); } 765 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit edData->userModify); }
766 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD ata->userDrag); } 766 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD ata->userDrag); }
767 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); } 767 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); }
768 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon InheritedData->textOverflow); } 768 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon InheritedData->textOverflow); }
769 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol lapse>(rareNonInheritedData->marginBeforeCollapse); } 769 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol lapse>(rareNonInheritedData->marginBeforeCollapse); }
770 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl apse>(rareNonInheritedData->marginAfterCollapse); } 770 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl apse>(rareNonInheritedData->marginAfterCollapse); }
771 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); } 771 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); }
772 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); } 772 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); }
773 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat a->lineBreak); } 773 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat a->lineBreak); }
774 const AtomicString& highlight() const { return rareInheritedData->highlight; } 774 const AtomicString& highlight() const { return rareInheritedData->highlight; }
775 Hyphens hyphens() const { return static_cast<Hyphens>(rareInheritedData->hyp hens); }
776 short hyphenationLimitBefore() const { return rareInheritedData->hyphenation LimitBefore; }
777 short hyphenationLimitAfter() const { return rareInheritedData->hyphenationL imitAfter; }
778 short hyphenationLimitLines() const { return rareInheritedData->hyphenationL imitLines; }
779 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; } 775 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; }
780 const AtomicString& locale() const { return rareInheritedData->locale; } 776 const AtomicString& locale() const { return rareInheritedData->locale; }
781 EBorderFit borderFit() const { return static_cast<EBorderFit>(rareNonInherit edData->m_borderFit); } 777 EBorderFit borderFit() const { return static_cast<EBorderFit>(rareNonInherit edData->m_borderFit); }
782 EResize resize() const { return static_cast<EResize>(rareInheritedData->resi ze); } 778 EResize resize() const { return static_cast<EResize>(rareInheritedData->resi ze); }
783 ColumnAxis columnAxis() const { return static_cast<ColumnAxis>(rareNonInheri tedData->m_multiCol->m_axis); } 779 ColumnAxis columnAxis() const { return static_cast<ColumnAxis>(rareNonInheri tedData->m_multiCol->m_axis); }
784 bool hasInlineColumnAxis() const { 780 bool hasInlineColumnAxis() const {
785 ColumnAxis axis = columnAxis(); 781 ColumnAxis axis = columnAxis();
786 return axis == AutoColumnAxis || isHorizontalWritingMode() == (axis == H orizontalColumnAxis); 782 return axis == AutoColumnAxis || isHorizontalWritingMode() == (axis == H orizontalColumnAxis);
787 } 783 }
788 ColumnProgression columnProgression() const { return static_cast<ColumnProgr ession>(rareNonInheritedData->m_multiCol->m_progression); } 784 ColumnProgression columnProgression() const { return static_cast<ColumnProgr ession>(rareNonInheritedData->m_multiCol->m_progression); }
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1203 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); } 1199 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); }
1204 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s ); } 1200 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s ); }
1205 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); } 1201 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); }
1206 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa ta, marginBeforeCollapse, c); } 1202 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa ta, marginBeforeCollapse, c); }
1207 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat a, marginAfterCollapse, c); } 1203 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat a, marginAfterCollapse, c); }
1208 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); } 1204 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); }
1209 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); } 1205 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); }
1210 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } 1206 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); }
1211 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli ght, h); } 1207 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli ght, h); }
1212 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); } 1208 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
1213 void setHyphenationLimitBefore(short limit) { SET_VAR(rareInheritedData, hyp henationLimitBefore, limit); }
1214 void setHyphenationLimitAfter(short limit) { SET_VAR(rareInheritedData, hyph enationLimitAfter, limit); }
1215 void setHyphenationLimitLines(short limit) { SET_VAR(rareInheritedData, hyph enationLimitLines, limit); }
1216 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); } 1209 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); }
1217 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca le, locale); } 1210 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca le, locale); }
1218 void setBorderFit(EBorderFit b) { SET_VAR(rareNonInheritedData, m_borderFit, b); } 1211 void setBorderFit(EBorderFit b) { SET_VAR(rareNonInheritedData, m_borderFit, b); }
1219 void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); } 1212 void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); }
1220 void setColumnAxis(ColumnAxis axis) { SET_VAR(rareNonInheritedData.access()- >m_multiCol, m_axis, axis); } 1213 void setColumnAxis(ColumnAxis axis) { SET_VAR(rareNonInheritedData.access()- >m_multiCol, m_axis, axis); }
1221 void setColumnProgression(ColumnProgression progression) { SET_VAR(rareNonIn heritedData.access()->m_multiCol, m_progression, progression); } 1214 void setColumnProgression(ColumnProgression progression) { SET_VAR(rareNonIn heritedData.access()->m_multiCol, m_progression, progression); }
1222 void setColumnWidth(float f) { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ width, f); } 1215 void setColumnWidth(float f) { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_ width, f); }
1223 void setHasAutoColumnWidth() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_w idth, 0); } 1216 void setHasAutoColumnWidth() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoWidth, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_w idth, 0); }
1224 void setColumnCount(unsigned short c) { SET_VAR(rareNonInheritedData.access( )->m_multiCol, m_autoCount, false); SET_VAR(rareNonInheritedData.access()->m_mul tiCol, m_count, c); } 1217 void setColumnCount(unsigned short c) { SET_VAR(rareNonInheritedData.access( )->m_multiCol, m_autoCount, false); SET_VAR(rareNonInheritedData.access()->m_mul tiCol, m_count, c); }
1225 void setHasAutoColumnCount() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoCount, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_c ount, 0); } 1218 void setHasAutoColumnCount() { SET_VAR(rareNonInheritedData.access()->m_mult iCol, m_autoCount, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_c ount, 0); }
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1532 static EUserDrag initialUserDrag() { return DRAG_AUTO; } 1525 static EUserDrag initialUserDrag() { return DRAG_AUTO; }
1533 static EUserSelect initialUserSelect() { return SELECT_TEXT; } 1526 static EUserSelect initialUserSelect() { return SELECT_TEXT; }
1534 static TextOverflow initialTextOverflow() { return TextOverflowClip; } 1527 static TextOverflow initialTextOverflow() { return TextOverflowClip; }
1535 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } 1528 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; }
1536 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; } 1529 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; }
1537 static EWordBreak initialWordBreak() { return NormalWordBreak; } 1530 static EWordBreak initialWordBreak() { return NormalWordBreak; }
1538 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } 1531 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; }
1539 static LineBreak initialLineBreak() { return LineBreakAuto; } 1532 static LineBreak initialLineBreak() { return LineBreakAuto; }
1540 static const AtomicString& initialHighlight() { return nullAtom; } 1533 static const AtomicString& initialHighlight() { return nullAtom; }
1541 static ESpeak initialSpeak() { return SpeakNormal; } 1534 static ESpeak initialSpeak() { return SpeakNormal; }
1542 static Hyphens initialHyphens() { return HyphensManual; }
1543 static short initialHyphenationLimitBefore() { return -1; }
1544 static short initialHyphenationLimitAfter() { return -1; }
1545 static short initialHyphenationLimitLines() { return -1; }
1546 static const AtomicString& initialHyphenationString() { return nullAtom; } 1535 static const AtomicString& initialHyphenationString() { return nullAtom; }
1547 static const AtomicString& initialLocale() { return nullAtom; } 1536 static const AtomicString& initialLocale() { return nullAtom; }
1548 static EBorderFit initialBorderFit() { return BorderFitBorder; } 1537 static EBorderFit initialBorderFit() { return BorderFitBorder; }
1549 static EResize initialResize() { return RESIZE_NONE; } 1538 static EResize initialResize() { return RESIZE_NONE; }
1550 static ControlPart initialAppearance() { return NoControlPart; } 1539 static ControlPart initialAppearance() { return NoControlPart; }
1551 static bool initialHasAspectRatio() { return false; } 1540 static bool initialHasAspectRatio() { return false; }
1552 static float initialAspectRatioDenominator() { return 1; } 1541 static float initialAspectRatioDenominator() { return 1; }
1553 static float initialAspectRatioNumerator() { return 1; } 1542 static float initialAspectRatioNumerator() { return 1; }
1554 static Order initialRTLOrdering() { return LogicalOrder; } 1543 static Order initialRTLOrdering() { return LogicalOrder; }
1555 static float initialTextStrokeWidth() { return 0; } 1544 static float initialTextStrokeWidth() { return 0; }
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
1746 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1735 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1747 return false; 1736 return false;
1748 1737
1749 rareInheritedData.access()->m_textOrientation = textOrientation; 1738 rareInheritedData.access()->m_textOrientation = textOrientation;
1750 return true; 1739 return true;
1751 } 1740 }
1752 1741
1753 } // namespace WebCore 1742 } // namespace WebCore
1754 1743
1755 #endif // RenderStyle_h 1744 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderText.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698