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

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

Issue 1485973005: Add CSS support for Containment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add test expectation Created 5 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 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 ShadowList* boxShadow() const { return rareNonInheritedData->m_boxShadow.get (); } 814 ShadowList* boxShadow() const { return rareNonInheritedData->m_boxShadow.get (); }
815 815
816 EBoxDecorationBreak boxDecorationBreak() const { return m_box->boxDecoration Break(); } 816 EBoxDecorationBreak boxDecorationBreak() const { return m_box->boxDecoration Break(); }
817 StyleReflection* boxReflect() const { return rareNonInheritedData->m_boxRefl ect.get(); } 817 StyleReflection* boxReflect() const { return rareNonInheritedData->m_boxRefl ect.get(); }
818 bool reflectionDataEquivalent(const ComputedStyle* otherStyle) const { retur n rareNonInheritedData->reflectionDataEquivalent(*otherStyle->rareNonInheritedDa ta); } 818 bool reflectionDataEquivalent(const ComputedStyle* otherStyle) const { retur n rareNonInheritedData->reflectionDataEquivalent(*otherStyle->rareNonInheritedDa ta); }
819 819
820 // FIXME: reflections should belong to this helper function but they are cur rently handled 820 // FIXME: reflections should belong to this helper function but they are cur rently handled
821 // through their self-painting layers. So the layout code doesn't account fo r them. 821 // through their self-painting layers. So the layout code doesn't account fo r them.
822 bool hasVisualOverflowingEffect() const { return boxShadow() || hasBorderIma geOutsets() || hasOutline(); } 822 bool hasVisualOverflowingEffect() const { return boxShadow() || hasBorderIma geOutsets() || hasOutline(); }
823 823
824 Containment contain() const { return static_cast<Containment>(rareNonInherit edData->m_contain); }
825
824 EBoxSizing boxSizing() const { return m_box->boxSizing(); } 826 EBoxSizing boxSizing() const { return m_box->boxSizing(); }
825 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit edData->userModify); } 827 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit edData->userModify); }
826 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD ata->userDrag); } 828 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD ata->userDrag); }
827 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); } 829 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); }
828 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon InheritedData->textOverflow); } 830 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon InheritedData->textOverflow); }
829 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol lapse>(rareNonInheritedData->marginBeforeCollapse); } 831 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol lapse>(rareNonInheritedData->marginBeforeCollapse); }
830 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl apse>(rareNonInheritedData->marginAfterCollapse); } 832 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl apse>(rareNonInheritedData->marginAfterCollapse); }
831 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); } 833 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); }
832 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); } 834 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); }
833 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat a->lineBreak); } 835 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat a->lineBreak); }
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 void setBoxDirection(EBoxDirection d) { inherited_flags._box_direction = d; } 1299 void setBoxDirection(EBoxDirection d) { inherited_flags._box_direction = d; }
1298 void setBoxFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_deprecat edFlexibleBox, flex, f); } 1300 void setBoxFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_deprecat edFlexibleBox, flex, f); }
1299 void setBoxFlexGroup(unsigned fg) { SET_VAR(rareNonInheritedData.access()->m _deprecatedFlexibleBox, flexGroup, fg); } 1301 void setBoxFlexGroup(unsigned fg) { SET_VAR(rareNonInheritedData.access()->m _deprecatedFlexibleBox, flexGroup, fg); }
1300 void setBoxLines(EBoxLines l) { SET_VAR(rareNonInheritedData.access()->m_dep recatedFlexibleBox, lines, l); } 1302 void setBoxLines(EBoxLines l) { SET_VAR(rareNonInheritedData.access()->m_dep recatedFlexibleBox, lines, l); }
1301 void setBoxOrdinalGroup(unsigned og) { SET_VAR(rareNonInheritedData.access() ->m_deprecatedFlexibleBox, ordinalGroup, og); } 1303 void setBoxOrdinalGroup(unsigned og) { SET_VAR(rareNonInheritedData.access() ->m_deprecatedFlexibleBox, ordinalGroup, og); }
1302 void setBoxOrient(EBoxOrient o) { SET_VAR(rareNonInheritedData.access()->m_d eprecatedFlexibleBox, orient, o); } 1304 void setBoxOrient(EBoxOrient o) { SET_VAR(rareNonInheritedData.access()->m_d eprecatedFlexibleBox, orient, o); }
1303 void setBoxPack(EBoxPack p) { SET_VAR(rareNonInheritedData.access()->m_depre catedFlexibleBox, pack, p); } 1305 void setBoxPack(EBoxPack p) { SET_VAR(rareNonInheritedData.access()->m_depre catedFlexibleBox, pack, p); }
1304 void setBoxShadow(PassRefPtr<ShadowList>); 1306 void setBoxShadow(PassRefPtr<ShadowList>);
1305 void setBoxReflect(PassRefPtr<StyleReflection> reflect) { if (rareNonInherit edData->m_boxReflect != reflect) rareNonInheritedData.access()->m_boxReflect = r eflect; } 1307 void setBoxReflect(PassRefPtr<StyleReflection> reflect) { if (rareNonInherit edData->m_boxReflect != reflect) rareNonInheritedData.access()->m_boxReflect = r eflect; }
1306 void setBoxSizing(EBoxSizing s) { SET_VAR(m_box, m_boxSizing, s); } 1308 void setBoxSizing(EBoxSizing s) { SET_VAR(m_box, m_boxSizing, s); }
1309 void setContain(Containment contain) { SET_VAR(rareNonInheritedData, m_conta in, contain); }
1307 void setFlexGrow(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibl eBox, m_flexGrow, f); } 1310 void setFlexGrow(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibl eBox, m_flexGrow, f); }
1308 void setFlexShrink(float f) { SET_VAR(rareNonInheritedData.access()->m_flexi bleBox, m_flexShrink, f); } 1311 void setFlexShrink(float f) { SET_VAR(rareNonInheritedData.access()->m_flexi bleBox, m_flexShrink, f); }
1309 void setFlexBasis(const Length& length) { SET_VAR(rareNonInheritedData.acces s()->m_flexibleBox, m_flexBasis, length); } 1312 void setFlexBasis(const Length& length) { SET_VAR(rareNonInheritedData.acces s()->m_flexibleBox, m_flexBasis, length); }
1310 // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set. 1313 // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set.
1311 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, max(std::numer ic_limits<int>::min() + 2, o)); } 1314 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, max(std::numer ic_limits<int>::min() + 2, o)); }
1312 void addCallbackSelector(const String& selector); 1315 void addCallbackSelector(const String& selector);
1313 void setAlignContent(const StyleContentAlignmentData& data) { SET_VAR(rareNo nInheritedData, m_alignContent, data); } 1316 void setAlignContent(const StyleContentAlignmentData& data) { SET_VAR(rareNo nInheritedData, m_alignContent, data); }
1314 void setAlignContentPosition(ContentPosition position) { rareNonInheritedDat a.access()->m_alignContent.setPosition(position); } 1317 void setAlignContentPosition(ContentPosition position) { rareNonInheritedDat a.access()->m_alignContent.setPosition(position); }
1315 void setAlignContentDistribution(ContentDistributionType distribution) { rar eNonInheritedData.access()->m_alignContent.setDistribution(distribution); } 1318 void setAlignContentDistribution(ContentDistributionType distribution) { rar eNonInheritedData.access()->m_alignContent.setDistribution(distribution); }
1316 void setAlignContentOverflow(OverflowAlignment overflow) { rareNonInheritedD ata.access()->m_alignContent.setOverflow(overflow); } 1319 void setAlignContentOverflow(OverflowAlignment overflow) { rareNonInheritedD ata.access()->m_alignContent.setOverflow(overflow); }
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 1619
1617 // Initial values for all the properties 1620 // Initial values for all the properties
1618 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; } 1621 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; }
1619 static EBorderStyle initialBorderStyle() { return BNONE; } 1622 static EBorderStyle initialBorderStyle() { return BNONE; }
1620 static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; } 1623 static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; }
1621 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); } 1624 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); }
1622 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); } 1625 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); }
1623 static ECaptionSide initialCaptionSide() { return CAPTOP; } 1626 static ECaptionSide initialCaptionSide() { return CAPTOP; }
1624 static EClear initialClear() { return CNONE; } 1627 static EClear initialClear() { return CNONE; }
1625 static LengthBox initialClip() { return LengthBox(); } 1628 static LengthBox initialClip() { return LengthBox(); }
1629 static Containment initialContain() { return ContainsNone; }
1626 static TextDirection initialDirection() { return LTR; } 1630 static TextDirection initialDirection() { return LTR; }
1627 static WritingMode initialWritingMode() { return TopToBottomWritingMode; } 1631 static WritingMode initialWritingMode() { return TopToBottomWritingMode; }
1628 static TextCombine initialTextCombine() { return TextCombineNone; } 1632 static TextCombine initialTextCombine() { return TextCombineNone; }
1629 static TextOrientation initialTextOrientation() { return TextOrientationMixe d; } 1633 static TextOrientation initialTextOrientation() { return TextOrientationMixe d; }
1630 static ObjectFit initialObjectFit() { return ObjectFitFill; } 1634 static ObjectFit initialObjectFit() { return ObjectFitFill; }
1631 static LengthPoint initialObjectPosition() { return LengthPoint(Length(50.0, Percent), Length(50.0, Percent)); } 1635 static LengthPoint initialObjectPosition() { return LengthPoint(Length(50.0, Percent), Length(50.0, Percent)); }
1632 static EDisplay initialDisplay() { return INLINE; } 1636 static EDisplay initialDisplay() { return INLINE; }
1633 static EEmptyCell initialEmptyCells() { return SHOW; } 1637 static EEmptyCell initialEmptyCells() { return SHOW; }
1634 static EFloat initialFloating() { return NoFloat; } 1638 static EFloat initialFloating() { return NoFloat; }
1635 static EListStylePosition initialListStylePosition() { return OUTSIDE; } 1639 static EListStylePosition initialListStylePosition() { return OUTSIDE; }
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
1994 } 1998 }
1995 1999
1996 inline bool ComputedStyle::hasPseudoElementStyle() const 2000 inline bool ComputedStyle::hasPseudoElementStyle() const
1997 { 2001 {
1998 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 2002 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1999 } 2003 }
2000 2004
2001 } // namespace blink 2005 } // namespace blink
2002 2006
2003 #endif // ComputedStyle_h 2007 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/UseCounter.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698