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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 1915343003: Add CSS hyphens property behind the test flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split histograms.xml to a separate CL Created 4 years, 7 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 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit edData->userModify); } 864 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit edData->userModify); }
865 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD ata->userDrag); } 865 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD ata->userDrag); }
866 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); } 866 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); }
867 TextOverflow getTextOverflow() const { return static_cast<TextOverflow>(rare NonInheritedData->textOverflow); } 867 TextOverflow getTextOverflow() const { return static_cast<TextOverflow>(rare NonInheritedData->textOverflow); }
868 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol lapse>(rareNonInheritedData->marginBeforeCollapse); } 868 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol lapse>(rareNonInheritedData->marginBeforeCollapse); }
869 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl apse>(rareNonInheritedData->marginAfterCollapse); } 869 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl apse>(rareNonInheritedData->marginAfterCollapse); }
870 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); } 870 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); }
871 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); } 871 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); }
872 LineBreak getLineBreak() const { return static_cast<LineBreak>(rareInherited Data->lineBreak); } 872 LineBreak getLineBreak() const { return static_cast<LineBreak>(rareInherited Data->lineBreak); }
873 const AtomicString& highlight() const { return rareInheritedData->highlight; } 873 const AtomicString& highlight() const { return rareInheritedData->highlight; }
874 Hyphens getHyphens() const { return static_cast<Hyphens>(rareInheritedData-> hyphens); }
874 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; } 875 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; }
875 const AtomicString& locale() const { return getFontDescription().locale(fals e); } 876 const AtomicString& locale() const { return getFontDescription().locale(fals e); }
876 EResize resize() const { return static_cast<EResize>(rareNonInheritedData->m _resize); } 877 EResize resize() const { return static_cast<EResize>(rareNonInheritedData->m _resize); }
877 bool hasInlinePaginationAxis() const 878 bool hasInlinePaginationAxis() const
878 { 879 {
879 // If the pagination axis is parallel with the writing mode inline axis, columns may be laid 880 // If the pagination axis is parallel with the writing mode inline axis, columns may be laid
880 // out along the inline axis, just like for regular multicol. Otherwise, we need to lay out 881 // out along the inline axis, just like for regular multicol. Otherwise, we need to lay out
881 // along the block axis. 882 // along the block axis.
882 if (isOverflowPaged()) 883 if (isOverflowPaged())
883 return (overflowY() == OverflowPagedX) == isHorizontalWritingMode(); 884 return (overflowY() == OverflowPagedX) == isHorizontalWritingMode();
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u ); } 1390 void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u ); }
1390 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); } 1391 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); }
1391 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s ); } 1392 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s ); }
1392 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); } 1393 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); }
1393 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa ta, marginBeforeCollapse, c); } 1394 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa ta, marginBeforeCollapse, c); }
1394 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat a, marginAfterCollapse, c); } 1395 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat a, marginAfterCollapse, c); }
1395 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); } 1396 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); }
1396 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); } 1397 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); }
1397 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } 1398 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); }
1398 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli ght, h); } 1399 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli ght, h); }
1400 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
1399 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); } 1401 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); }
1400 void setResize(EResize r) { SET_VAR(rareNonInheritedData, m_resize, r); } 1402 void setResize(EResize r) { SET_VAR(rareNonInheritedData, m_resize, r); }
1401 void setColumnWidth(float f) { SET_NESTED_VAR(rareNonInheritedData, m_multiC ol, m_autoWidth, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_widt h, f); } 1403 void setColumnWidth(float f) { SET_NESTED_VAR(rareNonInheritedData, m_multiC ol, m_autoWidth, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_widt h, f); }
1402 void setHasAutoColumnWidth() { SET_NESTED_VAR(rareNonInheritedData, m_multiC ol, m_autoWidth, true); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_width , 0); } 1404 void setHasAutoColumnWidth() { SET_NESTED_VAR(rareNonInheritedData, m_multiC ol, m_autoWidth, true); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_width , 0); }
1403 void setColumnCount(unsigned short c) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_autoCount, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCo l, m_count, c); } 1405 void setColumnCount(unsigned short c) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_autoCount, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCo l, m_count, c); }
1404 void setHasAutoColumnCount() { SET_NESTED_VAR(rareNonInheritedData, m_multiC ol, m_autoCount, true); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_count , initialColumnCount()); } 1406 void setHasAutoColumnCount() { SET_NESTED_VAR(rareNonInheritedData, m_multiC ol, m_autoCount, true); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_count , initialColumnCount()); }
1405 void setColumnFill(ColumnFill columnFill) { SET_NESTED_VAR(rareNonInheritedD ata, m_multiCol, m_fill, columnFill); } 1407 void setColumnFill(ColumnFill columnFill) { SET_NESTED_VAR(rareNonInheritedD ata, m_multiCol, m_fill, columnFill); }
1406 void setColumnGap(float f) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol , m_normalGap, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_gap, f ); } 1408 void setColumnGap(float f) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol , m_normalGap, false); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_gap, f ); }
1407 void setHasNormalColumnGap() { SET_NESTED_VAR(rareNonInheritedData, m_multiC ol, m_normalGap, true); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_gap, 0); } 1409 void setHasNormalColumnGap() { SET_NESTED_VAR(rareNonInheritedData, m_multiC ol, m_normalGap, true); SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_gap, 0); }
1408 void setColumnRuleColor(const StyleColor& c) { SET_BORDERVALUE_COLOR(rareNon InheritedData.access()->m_multiCol, m_rule, c); } 1410 void setColumnRuleColor(const StyleColor& c) { SET_BORDERVALUE_COLOR(rareNon InheritedData.access()->m_multiCol, m_rule, c); }
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1740 static EUserDrag initialUserDrag() { return DRAG_AUTO; } 1742 static EUserDrag initialUserDrag() { return DRAG_AUTO; }
1741 static EUserSelect initialUserSelect() { return SELECT_TEXT; } 1743 static EUserSelect initialUserSelect() { return SELECT_TEXT; }
1742 static TextOverflow initialTextOverflow() { return TextOverflowClip; } 1744 static TextOverflow initialTextOverflow() { return TextOverflowClip; }
1743 static EMarginCollapse initialMarginBeforeCollapse() { return MarginCollapse Collapse; } 1745 static EMarginCollapse initialMarginBeforeCollapse() { return MarginCollapse Collapse; }
1744 static EMarginCollapse initialMarginAfterCollapse() { return MarginCollapseC ollapse; } 1746 static EMarginCollapse initialMarginAfterCollapse() { return MarginCollapseC ollapse; }
1745 static EWordBreak initialWordBreak() { return NormalWordBreak; } 1747 static EWordBreak initialWordBreak() { return NormalWordBreak; }
1746 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } 1748 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; }
1747 static LineBreak initialLineBreak() { return LineBreakAuto; } 1749 static LineBreak initialLineBreak() { return LineBreakAuto; }
1748 static const AtomicString& initialHighlight() { return nullAtom; } 1750 static const AtomicString& initialHighlight() { return nullAtom; }
1749 static ESpeak initialSpeak() { return SpeakNormal; } 1751 static ESpeak initialSpeak() { return SpeakNormal; }
1752 static Hyphens initialHyphens() { return HyphensManual; }
1750 static const AtomicString& initialHyphenationString() { return nullAtom; } 1753 static const AtomicString& initialHyphenationString() { return nullAtom; }
1751 static EResize initialResize() { return RESIZE_NONE; } 1754 static EResize initialResize() { return RESIZE_NONE; }
1752 static ControlPart initialAppearance() { return NoControlPart; } 1755 static ControlPart initialAppearance() { return NoControlPart; }
1753 static Order initialRTLOrdering() { return LogicalOrder; } 1756 static Order initialRTLOrdering() { return LogicalOrder; }
1754 static float initialTextStrokeWidth() { return 0; } 1757 static float initialTextStrokeWidth() { return 0; }
1755 static unsigned short initialColumnCount() { return 1; } 1758 static unsigned short initialColumnCount() { return 1; }
1756 static ColumnFill initialColumnFill() { return ColumnFillBalance; } 1759 static ColumnFill initialColumnFill() { return ColumnFillBalance; }
1757 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; } 1760 static ColumnSpan initialColumnSpan() { return ColumnSpanNone; }
1758 static EmptyTransformOperations initialTransform() { return EmptyTransformOp erations(); } 1761 static EmptyTransformOperations initialTransform() { return EmptyTransformOp erations(); }
1759 static PassRefPtr<TranslateTransformOperation> initialTranslate() { return T ranslateTransformOperation::create(Length(0, Fixed), Length(0, Fixed), 0, Transf ormOperation::Translate3D); } 1762 static PassRefPtr<TranslateTransformOperation> initialTranslate() { return T ranslateTransformOperation::create(Length(0, Fixed), Length(0, Fixed), 0, Transf ormOperation::Translate3D); }
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
2034 } 2037 }
2035 2038
2036 inline bool ComputedStyle::hasPseudoElementStyle() const 2039 inline bool ComputedStyle::hasPseudoElementStyle() const
2037 { 2040 {
2038 return noninherited_flags.pseudoBits & ElementPseudoIdMask; 2041 return noninherited_flags.pseudoBits & ElementPseudoIdMask;
2039 } 2042 }
2040 2043
2041 } // namespace blink 2044 } // namespace blink
2042 2045
2043 #endif // ComputedStyle_h 2046 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/UseCounter.cpp ('k') | third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698