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

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

Issue 134013002: Upgrade align-self and align-items parsing to CSS 3 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Really fix the tests Created 6 years, 11 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 | Annotate | Revision Log
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 , m_regionThread(RenderStyle::initialRegionThread()) 55 , m_regionThread(RenderStyle::initialRegionThread())
56 , m_regionFragment(RenderStyle::initialRegionFragment()) 56 , m_regionFragment(RenderStyle::initialRegionFragment())
57 , m_regionBreakAfter(RenderStyle::initialPageBreak()) 57 , m_regionBreakAfter(RenderStyle::initialPageBreak())
58 , m_regionBreakBefore(RenderStyle::initialPageBreak()) 58 , m_regionBreakBefore(RenderStyle::initialPageBreak())
59 , m_regionBreakInside(RenderStyle::initialPageBreak()) 59 , m_regionBreakInside(RenderStyle::initialPageBreak())
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_alignSelf(RenderStyle::initialAlignSelf()) 66 , m_alignSelf(RenderStyle::initialAlignSelf())
67 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t())
66 , m_justifyContent(RenderStyle::initialJustifyContent()) 68 , m_justifyContent(RenderStyle::initialJustifyContent())
67 , userDrag(RenderStyle::initialUserDrag()) 69 , userDrag(RenderStyle::initialUserDrag())
68 , textOverflow(RenderStyle::initialTextOverflow()) 70 , textOverflow(RenderStyle::initialTextOverflow())
69 , marginBeforeCollapse(MCOLLAPSE) 71 , marginBeforeCollapse(MCOLLAPSE)
70 , marginAfterCollapse(MCOLLAPSE) 72 , marginAfterCollapse(MCOLLAPSE)
71 , m_appearance(RenderStyle::initialAppearance()) 73 , m_appearance(RenderStyle::initialAppearance())
72 , m_borderFit(RenderStyle::initialBorderFit()) 74 , m_borderFit(RenderStyle::initialBorderFit())
73 , m_textCombine(RenderStyle::initialTextCombine()) 75 , m_textCombine(RenderStyle::initialTextCombine())
74 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) 76 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
75 , m_wrapFlow(RenderStyle::initialWrapFlow()) 77 , m_wrapFlow(RenderStyle::initialWrapFlow())
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 , m_regionThread(o.m_regionThread) 135 , m_regionThread(o.m_regionThread)
134 , m_regionFragment(o.m_regionFragment) 136 , m_regionFragment(o.m_regionFragment)
135 , m_regionBreakAfter(o.m_regionBreakAfter) 137 , m_regionBreakAfter(o.m_regionBreakAfter)
136 , m_regionBreakBefore(o.m_regionBreakBefore) 138 , m_regionBreakBefore(o.m_regionBreakBefore)
137 , m_regionBreakInside(o.m_regionBreakInside) 139 , m_regionBreakInside(o.m_regionBreakInside)
138 , m_pageSizeType(o.m_pageSizeType) 140 , m_pageSizeType(o.m_pageSizeType)
139 , m_transformStyle3D(o.m_transformStyle3D) 141 , m_transformStyle3D(o.m_transformStyle3D)
140 , m_backfaceVisibility(o.m_backfaceVisibility) 142 , m_backfaceVisibility(o.m_backfaceVisibility)
141 , m_alignContent(o.m_alignContent) 143 , m_alignContent(o.m_alignContent)
142 , m_alignItems(o.m_alignItems) 144 , m_alignItems(o.m_alignItems)
145 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment)
143 , m_alignSelf(o.m_alignSelf) 146 , m_alignSelf(o.m_alignSelf)
147 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment)
144 , m_justifyContent(o.m_justifyContent) 148 , m_justifyContent(o.m_justifyContent)
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_borderFit(o.m_borderFit) 154 , m_borderFit(o.m_borderFit)
151 , m_textCombine(o.m_textCombine) 155 , m_textCombine(o.m_textCombine)
152 , m_textDecorationStyle(o.m_textDecorationStyle) 156 , m_textDecorationStyle(o.m_textDecorationStyle)
153 , m_wrapFlow(o.m_wrapFlow) 157 , m_wrapFlow(o.m_wrapFlow)
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 && m_regionThread == o.m_regionThread 222 && m_regionThread == o.m_regionThread
219 && m_regionFragment == o.m_regionFragment 223 && m_regionFragment == o.m_regionFragment
220 && m_regionBreakAfter == o.m_regionBreakAfter 224 && m_regionBreakAfter == o.m_regionBreakAfter
221 && m_regionBreakBefore == o.m_regionBreakBefore 225 && m_regionBreakBefore == o.m_regionBreakBefore
222 && m_regionBreakInside == o.m_regionBreakInside 226 && m_regionBreakInside == o.m_regionBreakInside
223 && m_pageSizeType == o.m_pageSizeType 227 && m_pageSizeType == o.m_pageSizeType
224 && m_transformStyle3D == o.m_transformStyle3D 228 && m_transformStyle3D == o.m_transformStyle3D
225 && m_backfaceVisibility == o.m_backfaceVisibility 229 && m_backfaceVisibility == o.m_backfaceVisibility
226 && m_alignContent == o.m_alignContent 230 && m_alignContent == o.m_alignContent
227 && m_alignItems == o.m_alignItems 231 && m_alignItems == o.m_alignItems
232 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment
228 && m_alignSelf == o.m_alignSelf 233 && m_alignSelf == o.m_alignSelf
234 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment
229 && m_justifyContent == o.m_justifyContent 235 && m_justifyContent == o.m_justifyContent
230 && userDrag == o.userDrag 236 && userDrag == o.userDrag
231 && textOverflow == o.textOverflow 237 && textOverflow == o.textOverflow
232 && marginBeforeCollapse == o.marginBeforeCollapse 238 && marginBeforeCollapse == o.marginBeforeCollapse
233 && marginAfterCollapse == o.marginAfterCollapse 239 && marginAfterCollapse == o.marginAfterCollapse
234 && m_appearance == o.m_appearance 240 && m_appearance == o.m_appearance
235 && m_borderFit == o.m_borderFit 241 && m_borderFit == o.m_borderFit
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
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 return false; 313 return false;
308 return true; 314 return true;
309 } 315 }
310 316
311 bool StyleRareNonInheritedData::hasFilters() const 317 bool StyleRareNonInheritedData::hasFilters() const
312 { 318 {
313 return m_filter.get() && !m_filter->m_operations.isEmpty(); 319 return m_filter.get() && !m_filter->m_operations.isEmpty();
314 } 320 }
315 321
316 } // namespace WebCore 322 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698