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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: sky/engine/core/rendering/style/RenderStyle.h

Issue 760583004: Remove webkit-margin-collapse (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 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
« no previous file with comments | « sky/engine/core/css/parser/CSSPropertyParser.cpp ('k') | sky/engine/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 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 702
703 // FIXME: reflections should belong to this helper function but they are cur rently handled 703 // FIXME: reflections should belong to this helper function but they are cur rently handled
704 // through their self-painting layers. So the rendering code doesn't account for them. 704 // through their self-painting layers. So the rendering code doesn't account for them.
705 bool hasVisualOverflowingEffect() const { return boxShadow() || hasBorderIma geOutsets() || hasOutline(); } 705 bool hasVisualOverflowingEffect() const { return boxShadow() || hasBorderIma geOutsets() || hasOutline(); }
706 706
707 EBoxSizing boxSizing() const { return m_box->boxSizing(); } 707 EBoxSizing boxSizing() const { return m_box->boxSizing(); }
708 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit edData->userModify); } 708 EUserModify userModify() const { return static_cast<EUserModify>(rareInherit edData->userModify); }
709 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD ata->userDrag); } 709 EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedD ata->userDrag); }
710 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); } 710 EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInherit edData->userSelect); }
711 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon InheritedData->textOverflow); } 711 TextOverflow textOverflow() const { return static_cast<TextOverflow>(rareNon InheritedData->textOverflow); }
712 EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCol lapse>(rareNonInheritedData->marginBeforeCollapse); }
713 EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginColl apse>(rareNonInheritedData->marginAfterCollapse); }
714 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); } 712 EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedD ata->wordBreak); }
715 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); } 713 EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareI nheritedData->overflowWrap); }
716 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat a->lineBreak); } 714 LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedDat a->lineBreak); }
717 const AtomicString& highlight() const { return rareInheritedData->highlight; } 715 const AtomicString& highlight() const { return rareInheritedData->highlight; }
718 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; } 716 const AtomicString& hyphenationString() const { return rareInheritedData->hy phenationString; }
719 const AtomicString& locale() const { return rareInheritedData->locale; } 717 const AtomicString& locale() const { return rareInheritedData->locale; }
720 bool hasInlineTransform() const { return rareNonInheritedData->m_hasInlineTr ansform; } 718 bool hasInlineTransform() const { return rareNonInheritedData->m_hasInlineTr ansform; }
721 const TransformOperations& transform() const { return rareNonInheritedData-> m_transform->m_operations; } 719 const TransformOperations& transform() const { return rareNonInheritedData-> m_transform->m_operations; }
722 const Length& transformOriginX() const { return rareNonInheritedData->m_tran sform->m_x; } 720 const Length& transformOriginX() const { return rareNonInheritedData->m_tran sform->m_x; }
723 const Length& transformOriginY() const { return rareNonInheritedData->m_tran sform->m_y; } 721 const Length& transformOriginY() const { return rareNonInheritedData->m_tran sform->m_y; }
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 void setJustifyItems(ItemPosition justifyItems) { SET_VAR(rareNonInheritedDa ta, m_justifyItems, justifyItems); } 1074 void setJustifyItems(ItemPosition justifyItems) { SET_VAR(rareNonInheritedDa ta, m_justifyItems, justifyItems); }
1077 void setJustifyItemsOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifyItemsOverflowAlignment, overflowAlignmen t); } 1075 void setJustifyItemsOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifyItemsOverflowAlignment, overflowAlignmen t); }
1078 void setJustifyItemsPositionType(ItemPositionType positionType) { SET_VAR(ra reNonInheritedData, m_justifyItemsPositionType, positionType); } 1076 void setJustifyItemsPositionType(ItemPositionType positionType) { SET_VAR(ra reNonInheritedData, m_justifyItemsPositionType, positionType); }
1079 void setJustifySelf(ItemPosition justifySelf) { SET_VAR(rareNonInheritedData , m_justifySelf, justifySelf); } 1077 void setJustifySelf(ItemPosition justifySelf) { SET_VAR(rareNonInheritedData , m_justifySelf, justifySelf); }
1080 void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment) ; } 1078 void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment) ; }
1081 1079
1082 void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u ); } 1080 void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u ); }
1083 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); } 1081 void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); }
1084 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s ); } 1082 void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s ); }
1085 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); } 1083 void setTextOverflow(TextOverflow overflow) { SET_VAR(rareNonInheritedData, textOverflow, overflow); }
1086 void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDa ta, marginBeforeCollapse, c); }
1087 void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedDat a, marginAfterCollapse, c); }
1088 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); } 1084 void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); }
1089 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); } 1085 void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowW rap, b); }
1090 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); } 1086 void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); }
1091 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli ght, h); } 1087 void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highli ght, h); }
1092 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); } 1088 void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
1093 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); } 1089 void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData , hyphenationString, h); }
1094 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca le, locale); } 1090 void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, loca le, locale); }
1095 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli neTransform, b); } 1091 void setHasInlineTransform(bool b) { SET_VAR(rareNonInheritedData, m_hasInli neTransform, b); }
1096 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); } 1092 void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInherited Data.access()->m_transform, m_operations, ops); }
1097 void setTransformOriginX(const Length& l) { SET_VAR(rareNonInheritedData.acc ess()->m_transform, m_x, l); } 1093 void setTransformOriginX(const Length& l) { SET_VAR(rareNonInheritedData.acc ess()->m_transform, m_x, l); }
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1291 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; } 1287 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }
1292 static ItemPosition initialJustifyItems() { return ItemPositionAuto; } 1288 static ItemPosition initialJustifyItems() { return ItemPositionAuto; }
1293 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove rflowAlignmentDefault; } 1289 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove rflowAlignmentDefault; }
1294 static ItemPositionType initialJustifyItemsPositionType() { return NonLegacy Position; } 1290 static ItemPositionType initialJustifyItemsPositionType() { return NonLegacy Position; }
1295 static ItemPosition initialJustifySelf() { return ItemPositionAuto; } 1291 static ItemPosition initialJustifySelf() { return ItemPositionAuto; }
1296 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over flowAlignmentDefault; } 1292 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over flowAlignmentDefault; }
1297 static EUserModify initialUserModify() { return READ_ONLY; } 1293 static EUserModify initialUserModify() { return READ_ONLY; }
1298 static EUserDrag initialUserDrag() { return DRAG_AUTO; } 1294 static EUserDrag initialUserDrag() { return DRAG_AUTO; }
1299 static EUserSelect initialUserSelect() { return SELECT_TEXT; } 1295 static EUserSelect initialUserSelect() { return SELECT_TEXT; }
1300 static TextOverflow initialTextOverflow() { return TextOverflowClip; } 1296 static TextOverflow initialTextOverflow() { return TextOverflowClip; }
1301 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; }
1302 static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; }
1303 static EWordBreak initialWordBreak() { return NormalWordBreak; } 1297 static EWordBreak initialWordBreak() { return NormalWordBreak; }
1304 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } 1298 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; }
1305 static LineBreak initialLineBreak() { return LineBreakAuto; } 1299 static LineBreak initialLineBreak() { return LineBreakAuto; }
1306 static const AtomicString& initialHighlight() { return nullAtom; } 1300 static const AtomicString& initialHighlight() { return nullAtom; }
1307 static ESpeak initialSpeak() { return SpeakNormal; } 1301 static ESpeak initialSpeak() { return SpeakNormal; }
1308 static const AtomicString& initialHyphenationString() { return nullAtom; } 1302 static const AtomicString& initialHyphenationString() { return nullAtom; }
1309 static const AtomicString& initialLocale() { return nullAtom; } 1303 static const AtomicString& initialLocale() { return nullAtom; }
1310 static bool initialHasAspectRatio() { return false; } 1304 static bool initialHasAspectRatio() { return false; }
1311 static float initialAspectRatioDenominator() { return 1; } 1305 static float initialAspectRatioDenominator() { return 1; }
1312 static float initialAspectRatioNumerator() { return 1; } 1306 static float initialAspectRatioNumerator() { return 1; }
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1424 1418
1425 rareInheritedData.access()->m_textOrientation = textOrientation; 1419 rareInheritedData.access()->m_textOrientation = textOrientation;
1426 return true; 1420 return true;
1427 } 1421 }
1428 1422
1429 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1423 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1430 1424
1431 } // namespace blink 1425 } // namespace blink
1432 1426
1433 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_ 1427 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_
OLDNEW
« no previous file with comments | « sky/engine/core/css/parser/CSSPropertyParser.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698