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

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

Issue 363133003: [CSS Grid Layout] Adapting align-self, align-items and justify-self to the last CSS 3 spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Resolve grid and flex cases during cascade, the rest will wait for layout. Created 6 years, 4 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, 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 if ((!oldStyle && newStyle) || (oldStyle && !newStyle)) 172 if ((!oldStyle && newStyle) || (oldStyle && !newStyle))
173 return Reattach; 173 return Reattach;
174 174
175 if (!oldStyle && !newStyle) 175 if (!oldStyle && !newStyle)
176 return NoChange; 176 return NoChange;
177 177
178 if (oldStyle->display() != newStyle->display() 178 if (oldStyle->display() != newStyle->display()
179 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI RST_LETTER) 179 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI RST_LETTER)
180 || oldStyle->columnSpan() != newStyle->columnSpan() 180 || oldStyle->columnSpan() != newStyle->columnSpan()
181 || !oldStyle->contentDataEquivalent(newStyle) 181 || !oldStyle->contentDataEquivalent(newStyle)
182 || oldStyle->hasTextCombine() != newStyle->hasTextCombine()) 182 || oldStyle->hasTextCombine() != newStyle->hasTextCombine()
183 || oldStyle->justifyItems() != newStyle->justifyItems()
184 || oldStyle->alignItems() != newStyle->alignItems())
183 return Reattach; 185 return Reattach;
184 186
185 if (*oldStyle == *newStyle) 187 if (*oldStyle == *newStyle)
186 return diffPseudoStyles(oldStyle, newStyle); 188 return diffPseudoStyles(oldStyle, newStyle);
187 189
188 if (oldStyle->inheritedNotEqual(newStyle) 190 if (oldStyle->inheritedNotEqual(newStyle)
189 || oldStyle->hasExplicitlyInheritedProperties() 191 || oldStyle->hasExplicitlyInheritedProperties()
190 || newStyle->hasExplicitlyInheritedProperties()) 192 || newStyle->hasExplicitlyInheritedProperties())
191 return Inherit; 193 return Inherit;
192 194
(...skipping 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after
1687 // right 1689 // right
1688 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1690 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1689 if (radiiSum > rect.height()) 1691 if (radiiSum > rect.height())
1690 factor = std::min(rect.height() / radiiSum, factor); 1692 factor = std::min(rect.height() / radiiSum, factor);
1691 1693
1692 ASSERT(factor <= 1); 1694 ASSERT(factor <= 1);
1693 return factor; 1695 return factor;
1694 } 1696 }
1695 1697
1696 } // namespace blink 1698 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698