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

Side by Side Diff: Source/core/rendering/style/StyleRareNonInheritedData.cpp

Issue 636993002: [CSS Grid Layout] Upgrade justify-content parsing to CSS3 Box Alignment spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 , m_objectPosition(RenderStyle::initialObjectPosition()) 59 , m_objectPosition(RenderStyle::initialObjectPosition())
60 , m_pageSizeType(PAGE_SIZE_AUTO) 60 , m_pageSizeType(PAGE_SIZE_AUTO)
61 , m_transformStyle3D(RenderStyle::initialTransformStyle3D()) 61 , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
62 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility()) 62 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())
63 , m_alignContent(RenderStyle::initialAlignContent()) 63 , m_alignContent(RenderStyle::initialAlignContent())
64 , m_alignItems(RenderStyle::initialAlignItems()) 64 , m_alignItems(RenderStyle::initialAlignItems())
65 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent()) 65 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent())
66 , m_alignSelf(RenderStyle::initialAlignSelf()) 66 , m_alignSelf(RenderStyle::initialAlignSelf())
67 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t()) 67 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t())
68 , m_justifyContent(RenderStyle::initialJustifyContent()) 68 , m_justifyContent(RenderStyle::initialJustifyContent())
69 , m_justifyContentDistribution(RenderStyle::initialJustifyContentDistributio n())
70 , m_justifyContentOverflowAlignment(RenderStyle::initialJustifyContentOverfl owAlignment())
69 , userDrag(RenderStyle::initialUserDrag()) 71 , userDrag(RenderStyle::initialUserDrag())
70 , textOverflow(RenderStyle::initialTextOverflow()) 72 , textOverflow(RenderStyle::initialTextOverflow())
71 , marginBeforeCollapse(MCOLLAPSE) 73 , marginBeforeCollapse(MCOLLAPSE)
72 , marginAfterCollapse(MCOLLAPSE) 74 , marginAfterCollapse(MCOLLAPSE)
73 , m_appearance(RenderStyle::initialAppearance()) 75 , m_appearance(RenderStyle::initialAppearance())
74 , m_borderFit(RenderStyle::initialBorderFit()) 76 , m_borderFit(RenderStyle::initialBorderFit())
75 , m_textCombine(RenderStyle::initialTextCombine()) 77 , m_textCombine(RenderStyle::initialTextCombine())
76 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) 78 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
77 , m_wrapFlow(RenderStyle::initialWrapFlow()) 79 , m_wrapFlow(RenderStyle::initialWrapFlow())
78 , m_wrapThrough(RenderStyle::initialWrapThrough()) 80 , m_wrapThrough(RenderStyle::initialWrapThrough())
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 , m_objectPosition(o.m_objectPosition) 145 , m_objectPosition(o.m_objectPosition)
144 , m_pageSizeType(o.m_pageSizeType) 146 , m_pageSizeType(o.m_pageSizeType)
145 , m_transformStyle3D(o.m_transformStyle3D) 147 , m_transformStyle3D(o.m_transformStyle3D)
146 , m_backfaceVisibility(o.m_backfaceVisibility) 148 , m_backfaceVisibility(o.m_backfaceVisibility)
147 , m_alignContent(o.m_alignContent) 149 , m_alignContent(o.m_alignContent)
148 , m_alignItems(o.m_alignItems) 150 , m_alignItems(o.m_alignItems)
149 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) 151 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment)
150 , m_alignSelf(o.m_alignSelf) 152 , m_alignSelf(o.m_alignSelf)
151 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment) 153 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment)
152 , m_justifyContent(o.m_justifyContent) 154 , m_justifyContent(o.m_justifyContent)
155 , m_justifyContentDistribution(o.m_justifyContentDistribution)
156 , m_justifyContentOverflowAlignment(o.m_justifyContentOverflowAlignment)
153 , userDrag(o.userDrag) 157 , userDrag(o.userDrag)
154 , textOverflow(o.textOverflow) 158 , textOverflow(o.textOverflow)
155 , marginBeforeCollapse(o.marginBeforeCollapse) 159 , marginBeforeCollapse(o.marginBeforeCollapse)
156 , marginAfterCollapse(o.marginAfterCollapse) 160 , marginAfterCollapse(o.marginAfterCollapse)
157 , m_appearance(o.m_appearance) 161 , m_appearance(o.m_appearance)
158 , m_borderFit(o.m_borderFit) 162 , m_borderFit(o.m_borderFit)
159 , m_textCombine(o.m_textCombine) 163 , m_textCombine(o.m_textCombine)
160 , m_textDecorationStyle(o.m_textDecorationStyle) 164 , m_textDecorationStyle(o.m_textDecorationStyle)
161 , m_wrapFlow(o.m_wrapFlow) 165 , m_wrapFlow(o.m_wrapFlow)
162 , m_wrapThrough(o.m_wrapThrough) 166 , m_wrapThrough(o.m_wrapThrough)
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 && m_callbackSelectors == o.m_callbackSelectors 238 && m_callbackSelectors == o.m_callbackSelectors
235 && m_pageSizeType == o.m_pageSizeType 239 && m_pageSizeType == o.m_pageSizeType
236 && m_transformStyle3D == o.m_transformStyle3D 240 && m_transformStyle3D == o.m_transformStyle3D
237 && m_backfaceVisibility == o.m_backfaceVisibility 241 && m_backfaceVisibility == o.m_backfaceVisibility
238 && m_alignContent == o.m_alignContent 242 && m_alignContent == o.m_alignContent
239 && m_alignItems == o.m_alignItems 243 && m_alignItems == o.m_alignItems
240 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment 244 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment
241 && m_alignSelf == o.m_alignSelf 245 && m_alignSelf == o.m_alignSelf
242 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment 246 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment
243 && m_justifyContent == o.m_justifyContent 247 && m_justifyContent == o.m_justifyContent
248 && m_justifyContentDistribution == o.m_justifyContentDistribution
249 && m_justifyContentOverflowAlignment == o.m_justifyContentOverflowAlignm ent
244 && userDrag == o.userDrag 250 && userDrag == o.userDrag
245 && textOverflow == o.textOverflow 251 && textOverflow == o.textOverflow
246 && marginBeforeCollapse == o.marginBeforeCollapse 252 && marginBeforeCollapse == o.marginBeforeCollapse
247 && marginAfterCollapse == o.marginAfterCollapse 253 && marginAfterCollapse == o.marginAfterCollapse
248 && m_appearance == o.m_appearance 254 && m_appearance == o.m_appearance
249 && m_borderFit == o.m_borderFit 255 && m_borderFit == o.m_borderFit
250 && m_textCombine == o.m_textCombine 256 && m_textCombine == o.m_textCombine
251 && m_textDecorationStyle == o.m_textDecorationStyle 257 && m_textDecorationStyle == o.m_textDecorationStyle
252 && m_wrapFlow == o.m_wrapFlow 258 && m_wrapFlow == o.m_wrapFlow
253 && m_wrapThrough == o.m_wrapThrough 259 && m_wrapThrough == o.m_wrapThrough
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 return false; 320 return false;
315 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); 321 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions);
316 } 322 }
317 323
318 bool StyleRareNonInheritedData::hasFilters() const 324 bool StyleRareNonInheritedData::hasFilters() const
319 { 325 {
320 return m_filter.get() && !m_filter->m_operations.isEmpty(); 326 return m_filter.get() && !m_filter->m_operations.isEmpty();
321 } 327 }
322 328
323 } // namespace blink 329 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698