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

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

Issue 201573009: Remove -webkit-column-progression and -webkit-column-axis properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master (fixed the DOS-style line break issue there) Created 6 years, 9 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 { 173 {
174 if ((!oldStyle && newStyle) || (oldStyle && !newStyle)) 174 if ((!oldStyle && newStyle) || (oldStyle && !newStyle))
175 return Reattach; 175 return Reattach;
176 176
177 if (!oldStyle && !newStyle) 177 if (!oldStyle && !newStyle)
178 return NoChange; 178 return NoChange;
179 179
180 if (oldStyle->display() != newStyle->display() 180 if (oldStyle->display() != newStyle->display()
181 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI RST_LETTER) 181 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI RST_LETTER)
182 || oldStyle->columnSpan() != newStyle->columnSpan() 182 || oldStyle->columnSpan() != newStyle->columnSpan()
183 || oldStyle->specifiesAutoColumns() != newStyle->specifiesAutoColumns() 183 || oldStyle->specifiesColumns() != newStyle->specifiesColumns()
184 || !oldStyle->contentDataEquivalent(newStyle) 184 || !oldStyle->contentDataEquivalent(newStyle)
185 || oldStyle->hasTextCombine() != newStyle->hasTextCombine()) 185 || oldStyle->hasTextCombine() != newStyle->hasTextCombine())
186 return Reattach; 186 return Reattach;
187 187
188 if (*oldStyle == *newStyle) 188 if (*oldStyle == *newStyle)
189 return comparePseudoStyles(oldStyle, newStyle); 189 return comparePseudoStyles(oldStyle, newStyle);
190 190
191 if (oldStyle->inheritedNotEqual(newStyle) 191 if (oldStyle->inheritedNotEqual(newStyle)
192 || oldStyle->hasExplicitlyInheritedProperties() 192 || oldStyle->hasExplicitlyInheritedProperties()
193 || newStyle->hasExplicitlyInheritedProperties()) 193 || newStyle->hasExplicitlyInheritedProperties())
(...skipping 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1655 // right 1655 // right
1656 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1656 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1657 if (radiiSum > rect.height()) 1657 if (radiiSum > rect.height())
1658 factor = std::min(rect.height() / radiiSum, factor); 1658 factor = std::min(rect.height() / radiiSum, factor);
1659 1659
1660 ASSERT(factor <= 1); 1660 ASSERT(factor <= 1);
1661 return factor; 1661 return factor;
1662 } 1662 }
1663 1663
1664 } // namespace WebCore 1664 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698