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

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: Rebaseline some tests expectations. Created 6 years, 1 month 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 | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | 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) 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 , m_objectPosition(RenderStyle::initialObjectPosition()) 56 , m_objectPosition(RenderStyle::initialObjectPosition())
57 , m_pageSizeType(PAGE_SIZE_AUTO) 57 , m_pageSizeType(PAGE_SIZE_AUTO)
58 , m_transformStyle3D(RenderStyle::initialTransformStyle3D()) 58 , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
59 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility()) 59 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())
60 , m_alignContent(RenderStyle::initialAlignContent()) 60 , m_alignContent(RenderStyle::initialAlignContent())
61 , m_alignItems(RenderStyle::initialAlignItems()) 61 , m_alignItems(RenderStyle::initialAlignItems())
62 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent()) 62 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent())
63 , m_alignSelf(RenderStyle::initialAlignSelf()) 63 , m_alignSelf(RenderStyle::initialAlignSelf())
64 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t()) 64 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t())
65 , m_justifyContent(RenderStyle::initialJustifyContent()) 65 , m_justifyContent(RenderStyle::initialJustifyContent())
66 , m_justifyContentDistribution(RenderStyle::initialJustifyContentDistributio n())
67 , m_justifyContentOverflowAlignment(RenderStyle::initialJustifyContentOverfl owAlignment())
66 , userDrag(RenderStyle::initialUserDrag()) 68 , userDrag(RenderStyle::initialUserDrag())
67 , textOverflow(RenderStyle::initialTextOverflow()) 69 , textOverflow(RenderStyle::initialTextOverflow())
68 , marginBeforeCollapse(MCOLLAPSE) 70 , marginBeforeCollapse(MCOLLAPSE)
69 , marginAfterCollapse(MCOLLAPSE) 71 , marginAfterCollapse(MCOLLAPSE)
70 , m_appearance(RenderStyle::initialAppearance()) 72 , m_appearance(RenderStyle::initialAppearance())
71 , m_textCombine(RenderStyle::initialTextCombine()) 73 , m_textCombine(RenderStyle::initialTextCombine())
72 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) 74 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
73 , m_wrapFlow(RenderStyle::initialWrapFlow()) 75 , m_wrapFlow(RenderStyle::initialWrapFlow())
74 , m_wrapThrough(RenderStyle::initialWrapThrough()) 76 , m_wrapThrough(RenderStyle::initialWrapThrough())
75 , m_hasCurrentOpacityAnimation(false) 77 , m_hasCurrentOpacityAnimation(false)
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 , m_objectPosition(o.m_objectPosition) 137 , m_objectPosition(o.m_objectPosition)
136 , m_pageSizeType(o.m_pageSizeType) 138 , m_pageSizeType(o.m_pageSizeType)
137 , m_transformStyle3D(o.m_transformStyle3D) 139 , m_transformStyle3D(o.m_transformStyle3D)
138 , m_backfaceVisibility(o.m_backfaceVisibility) 140 , m_backfaceVisibility(o.m_backfaceVisibility)
139 , m_alignContent(o.m_alignContent) 141 , m_alignContent(o.m_alignContent)
140 , m_alignItems(o.m_alignItems) 142 , m_alignItems(o.m_alignItems)
141 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) 143 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment)
142 , m_alignSelf(o.m_alignSelf) 144 , m_alignSelf(o.m_alignSelf)
143 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment) 145 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment)
144 , m_justifyContent(o.m_justifyContent) 146 , m_justifyContent(o.m_justifyContent)
147 , m_justifyContentDistribution(o.m_justifyContentDistribution)
148 , m_justifyContentOverflowAlignment(o.m_justifyContentOverflowAlignment)
145 , userDrag(o.userDrag) 149 , userDrag(o.userDrag)
146 , textOverflow(o.textOverflow) 150 , textOverflow(o.textOverflow)
147 , marginBeforeCollapse(o.marginBeforeCollapse) 151 , marginBeforeCollapse(o.marginBeforeCollapse)
148 , marginAfterCollapse(o.marginAfterCollapse) 152 , marginAfterCollapse(o.marginAfterCollapse)
149 , m_appearance(o.m_appearance) 153 , m_appearance(o.m_appearance)
150 , m_textCombine(o.m_textCombine) 154 , m_textCombine(o.m_textCombine)
151 , m_textDecorationStyle(o.m_textDecorationStyle) 155 , m_textDecorationStyle(o.m_textDecorationStyle)
152 , m_wrapFlow(o.m_wrapFlow) 156 , m_wrapFlow(o.m_wrapFlow)
153 , m_wrapThrough(o.m_wrapThrough) 157 , m_wrapThrough(o.m_wrapThrough)
154 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation) 158 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation)
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 && m_callbackSelectors == o.m_callbackSelectors 225 && m_callbackSelectors == o.m_callbackSelectors
222 && m_pageSizeType == o.m_pageSizeType 226 && m_pageSizeType == o.m_pageSizeType
223 && m_transformStyle3D == o.m_transformStyle3D 227 && m_transformStyle3D == o.m_transformStyle3D
224 && m_backfaceVisibility == o.m_backfaceVisibility 228 && m_backfaceVisibility == o.m_backfaceVisibility
225 && m_alignContent == o.m_alignContent 229 && m_alignContent == o.m_alignContent
226 && m_alignItems == o.m_alignItems 230 && m_alignItems == o.m_alignItems
227 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment 231 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment
228 && m_alignSelf == o.m_alignSelf 232 && m_alignSelf == o.m_alignSelf
229 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment 233 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment
230 && m_justifyContent == o.m_justifyContent 234 && m_justifyContent == o.m_justifyContent
235 && m_justifyContentDistribution == o.m_justifyContentDistribution
236 && m_justifyContentOverflowAlignment == o.m_justifyContentOverflowAlignm ent
231 && userDrag == o.userDrag 237 && userDrag == o.userDrag
232 && textOverflow == o.textOverflow 238 && textOverflow == o.textOverflow
233 && marginBeforeCollapse == o.marginBeforeCollapse 239 && marginBeforeCollapse == o.marginBeforeCollapse
234 && marginAfterCollapse == o.marginAfterCollapse 240 && marginAfterCollapse == o.marginAfterCollapse
235 && m_appearance == o.m_appearance 241 && m_appearance == o.m_appearance
236 && m_textCombine == o.m_textCombine 242 && m_textCombine == o.m_textCombine
237 && m_textDecorationStyle == o.m_textDecorationStyle 243 && m_textDecorationStyle == o.m_textDecorationStyle
238 && m_wrapFlow == o.m_wrapFlow 244 && m_wrapFlow == o.m_wrapFlow
239 && m_wrapThrough == o.m_wrapThrough 245 && m_wrapThrough == o.m_wrapThrough
240 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation 246 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 return false; 305 return false;
300 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); 306 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions);
301 } 307 }
302 308
303 bool StyleRareNonInheritedData::hasFilters() const 309 bool StyleRareNonInheritedData::hasFilters() const
304 { 310 {
305 return m_filter.get() && !m_filter->m_operations.isEmpty(); 311 return m_filter.get() && !m_filter->m_operations.isEmpty();
306 } 312 }
307 313
308 } // namespace blink 314 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698