| OLD | NEW |
| 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 Loading... |
| 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->specifiesColumns() != newStyle->specifiesColumns() | |
| 184 || !oldStyle->contentDataEquivalent(newStyle) | 183 || !oldStyle->contentDataEquivalent(newStyle) |
| 185 || oldStyle->hasTextCombine() != newStyle->hasTextCombine()) | 184 || oldStyle->hasTextCombine() != newStyle->hasTextCombine()) |
| 186 return Reattach; | 185 return Reattach; |
| 187 | 186 |
| 188 if (*oldStyle == *newStyle) | 187 if (*oldStyle == *newStyle) |
| 189 return diffPseudoStyles(oldStyle, newStyle); | 188 return diffPseudoStyles(oldStyle, newStyle); |
| 190 | 189 |
| 191 if (oldStyle->inheritedNotEqual(newStyle) | 190 if (oldStyle->inheritedNotEqual(newStyle) |
| 192 || oldStyle->hasExplicitlyInheritedProperties() | 191 || oldStyle->hasExplicitlyInheritedProperties() |
| 193 || newStyle->hasExplicitlyInheritedProperties()) | 192 || newStyle->hasExplicitlyInheritedProperties()) |
| (...skipping 1460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1654 // right | 1653 // right |
| 1655 radiiSum = radii.topRight().height() + radii.bottomRight().height(); | 1654 radiiSum = radii.topRight().height() + radii.bottomRight().height(); |
| 1656 if (radiiSum > rect.height()) | 1655 if (radiiSum > rect.height()) |
| 1657 factor = std::min(rect.height() / radiiSum, factor); | 1656 factor = std::min(rect.height() / radiiSum, factor); |
| 1658 | 1657 |
| 1659 ASSERT(factor <= 1); | 1658 ASSERT(factor <= 1); |
| 1660 return factor; | 1659 return factor; |
| 1661 } | 1660 } |
| 1662 | 1661 |
| 1663 } // namespace WebCore | 1662 } // namespace WebCore |
| OLD | NEW |