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

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

Issue 689853003: Remove CSS Grid Layout and grid media queries. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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
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, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 m_box.init(); 114 m_box.init();
115 visual.init(); 115 visual.init();
116 m_background.init(); 116 m_background.init();
117 surround.init(); 117 surround.init();
118 rareNonInheritedData.init(); 118 rareNonInheritedData.init();
119 rareNonInheritedData.access()->m_flexibleBox.init(); 119 rareNonInheritedData.access()->m_flexibleBox.init();
120 rareNonInheritedData.access()->m_transform.init(); 120 rareNonInheritedData.access()->m_transform.init();
121 rareNonInheritedData.access()->m_willChange.init(); 121 rareNonInheritedData.access()->m_willChange.init();
122 rareNonInheritedData.access()->m_filter.init(); 122 rareNonInheritedData.access()->m_filter.init();
123 rareNonInheritedData.access()->m_grid.init();
124 rareNonInheritedData.access()->m_gridItem.init();
125 rareInheritedData.init(); 123 rareInheritedData.init();
126 inherited.init(); 124 inherited.init();
127 } 125 }
128 126
129 ALWAYS_INLINE RenderStyle::RenderStyle(const RenderStyle& o) 127 ALWAYS_INLINE RenderStyle::RenderStyle(const RenderStyle& o)
130 : RefCounted<RenderStyle>() 128 : RefCounted<RenderStyle>()
131 , m_box(o.m_box) 129 , m_box(o.m_box)
132 , visual(o.visual) 130 , visual(o.visual)
133 , m_background(o.m_background) 131 , m_background(o.m_background)
134 , surround(o.surround) 132 , surround(o.surround)
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li neClamp 329 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li neClamp
332 || rareNonInheritedData->textOverflow != other.rareNonInheritedData- >textOverflow 330 || rareNonInheritedData->textOverflow != other.rareNonInheritedData- >textOverflow
333 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m _wrapFlow 331 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m _wrapFlow
334 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData ->m_wrapThrough 332 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData ->m_wrapThrough
335 || rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData ->m_shapeMargin 333 || rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData ->m_shapeMargin
336 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or der 334 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or der
337 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat a->m_alignContent 335 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat a->m_alignContent
338 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData- >m_alignItems 336 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData- >m_alignItems
339 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData-> m_alignSelf 337 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData-> m_alignSelf
340 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD ata->m_justifyContent 338 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD ata->m_justifyContent
341 || rareNonInheritedData->m_grid.get() != other.rareNonInheritedData- >m_grid.get()
342 || rareNonInheritedData->m_gridItem.get() != other.rareNonInheritedD ata->m_gridItem.get()
343 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData- >hasFilters()) 339 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData- >hasFilters())
344 return true; 340 return true;
345 341
346 if (rareNonInheritedData->m_flexibleBox.get() != other.rareNonInheritedD ata->m_flexibleBox.get() 342 if (rareNonInheritedData->m_flexibleBox.get() != other.rareNonInheritedD ata->m_flexibleBox.get()
347 && *rareNonInheritedData->m_flexibleBox.get() != *other.rareNonInher itedData->m_flexibleBox.get()) 343 && *rareNonInheritedData->m_flexibleBox.get() != *other.rareNonInher itedData->m_flexibleBox.get())
348 return true; 344 return true;
349 345
350 // FIXME: We should add an optimized form of layout that just recomputes visual overflow. 346 // FIXME: We should add an optimized form of layout that just recomputes visual overflow.
351 if (!rareNonInheritedData->shadowDataEquivalent(*other.rareNonInheritedD ata.get())) 347 if (!rareNonInheritedData->shadowDataEquivalent(*other.rareNonInheritedD ata.get()))
352 return true; 348 return true;
(...skipping 1032 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 // right 1381 // right
1386 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1382 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1387 if (radiiSum > rect.height()) 1383 if (radiiSum > rect.height())
1388 factor = std::min(rect.height() / radiiSum, factor); 1384 factor = std::min(rect.height() / radiiSum, factor);
1389 1385
1390 ASSERT(factor <= 1); 1386 ASSERT(factor <= 1);
1391 return factor; 1387 return factor;
1392 } 1388 }
1393 1389
1394 } // namespace blink 1390 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.h ('k') | sky/engine/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698