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

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

Issue 333423005: [CSS Grid Layout] Implement 'justify-items' parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch rebased. Created 6 years, 5 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 , m_hasCurrentTransformAnimation(false) 80 , m_hasCurrentTransformAnimation(false)
81 , m_hasCurrentFilterAnimation(false) 81 , m_hasCurrentFilterAnimation(false)
82 , m_runningOpacityAnimationOnCompositor(false) 82 , m_runningOpacityAnimationOnCompositor(false)
83 , m_runningTransformAnimationOnCompositor(false) 83 , m_runningTransformAnimationOnCompositor(false)
84 , m_runningFilterAnimationOnCompositor(false) 84 , m_runningFilterAnimationOnCompositor(false)
85 , m_hasAspectRatio(false) 85 , m_hasAspectRatio(false)
86 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) 86 , m_effectiveBlendMode(RenderStyle::initialBlendMode())
87 , m_touchAction(RenderStyle::initialTouchAction()) 87 , m_touchAction(RenderStyle::initialTouchAction())
88 , m_objectFit(RenderStyle::initialObjectFit()) 88 , m_objectFit(RenderStyle::initialObjectFit())
89 , m_isolation(RenderStyle::initialIsolation()) 89 , m_isolation(RenderStyle::initialIsolation())
90 , m_justifyItems(RenderStyle::initialJustifyItems())
91 , m_justifyItemsOverflowAlignment(RenderStyle::initialJustifyItemsOverflowAl ignment())
92 , m_justifyItemsPositionType(NonLegacyPosition)
90 , m_justifySelf(RenderStyle::initialJustifySelf()) 93 , m_justifySelf(RenderStyle::initialJustifySelf())
91 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig nment()) 94 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig nment())
92 , m_scrollBehavior(RenderStyle::initialScrollBehavior()) 95 , m_scrollBehavior(RenderStyle::initialScrollBehavior())
93 , m_requiresAcceleratedCompositingForExternalReasons(false) 96 , m_requiresAcceleratedCompositingForExternalReasons(false)
94 { 97 {
95 m_maskBoxImage.setMaskDefaults(); 98 m_maskBoxImage.setMaskDefaults();
96 } 99 }
97 100
98 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o) 101 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o)
99 : RefCounted<StyleRareNonInheritedData>() 102 : RefCounted<StyleRareNonInheritedData>()
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation) 163 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation)
161 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation) 164 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation)
162 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi tor) 165 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi tor)
163 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom positor) 166 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom positor)
164 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito r) 167 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito r)
165 , m_hasAspectRatio(o.m_hasAspectRatio) 168 , m_hasAspectRatio(o.m_hasAspectRatio)
166 , m_effectiveBlendMode(o.m_effectiveBlendMode) 169 , m_effectiveBlendMode(o.m_effectiveBlendMode)
167 , m_touchAction(o.m_touchAction) 170 , m_touchAction(o.m_touchAction)
168 , m_objectFit(o.m_objectFit) 171 , m_objectFit(o.m_objectFit)
169 , m_isolation(o.m_isolation) 172 , m_isolation(o.m_isolation)
173 , m_justifyItems(o.m_justifyItems)
174 , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment)
175 , m_justifyItemsPositionType(o.m_justifyItemsPositionType)
170 , m_justifySelf(o.m_justifySelf) 176 , m_justifySelf(o.m_justifySelf)
171 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) 177 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment)
172 , m_scrollBehavior(o.m_scrollBehavior) 178 , m_scrollBehavior(o.m_scrollBehavior)
173 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons) 179 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons)
174 { 180 {
175 } 181 }
176 182
177 StyleRareNonInheritedData::~StyleRareNonInheritedData() 183 StyleRareNonInheritedData::~StyleRareNonInheritedData()
178 { 184 {
179 const FilterOperations& filterOperations = m_filter->m_operations; 185 const FilterOperations& filterOperations = m_filter->m_operations;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 && m_wrapFlow == o.m_wrapFlow 250 && m_wrapFlow == o.m_wrapFlow
245 && m_wrapThrough == o.m_wrapThrough 251 && m_wrapThrough == o.m_wrapThrough
246 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation 252 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation
247 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation 253 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation
248 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation 254 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation
249 && m_effectiveBlendMode == o.m_effectiveBlendMode 255 && m_effectiveBlendMode == o.m_effectiveBlendMode
250 && m_hasAspectRatio == o.m_hasAspectRatio 256 && m_hasAspectRatio == o.m_hasAspectRatio
251 && m_touchAction == o.m_touchAction 257 && m_touchAction == o.m_touchAction
252 && m_objectFit == o.m_objectFit 258 && m_objectFit == o.m_objectFit
253 && m_isolation == o.m_isolation 259 && m_isolation == o.m_isolation
260 && m_justifyItems == o.m_justifyItems
261 && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment
262 && m_justifyItemsPositionType == o.m_justifyItemsPositionType
254 && m_justifySelf == o.m_justifySelf 263 && m_justifySelf == o.m_justifySelf
255 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment 264 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment
256 && m_scrollBehavior == o.m_scrollBehavior 265 && m_scrollBehavior == o.m_scrollBehavior
257 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons; 266 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons;
258 } 267 }
259 268
260 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const 269 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const
261 { 270 {
262 ContentData* a = m_content.get(); 271 ContentData* a = m_content.get();
263 ContentData* b = o.m_content.get(); 272 ContentData* b = o.m_content.get();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 return false; 311 return false;
303 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); 312 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions);
304 } 313 }
305 314
306 bool StyleRareNonInheritedData::hasFilters() const 315 bool StyleRareNonInheritedData::hasFilters() const
307 { 316 {
308 return m_filter.get() && !m_filter->m_operations.isEmpty(); 317 return m_filter.get() && !m_filter->m_operations.isEmpty();
309 } 318 }
310 319
311 } // namespace WebCore 320 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698