| 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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 if (surround.get() != other.surround.get()) { | 312 if (surround.get() != other.surround.get()) { |
| 313 // If our border widths change, then we need to layout. Other changes to
borders only necessitate a paint invalidation. | 313 // If our border widths change, then we need to layout. Other changes to
borders only necessitate a paint invalidation. |
| 314 if (borderLeftWidth() != other.borderLeftWidth() | 314 if (borderLeftWidth() != other.borderLeftWidth() |
| 315 || borderTopWidth() != other.borderTopWidth() | 315 || borderTopWidth() != other.borderTopWidth() |
| 316 || borderBottomWidth() != other.borderBottomWidth() | 316 || borderBottomWidth() != other.borderBottomWidth() |
| 317 || borderRightWidth() != other.borderRightWidth()) | 317 || borderRightWidth() != other.borderRightWidth()) |
| 318 return true; | 318 return true; |
| 319 } | 319 } |
| 320 | 320 |
| 321 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 321 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
| 322 if (rareNonInheritedData->marginBeforeCollapse != other.rareNonInherited
Data->marginBeforeCollapse | 322 if (rareNonInheritedData->textOverflow != other.rareNonInheritedData->te
xtOverflow |
| 323 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit
edData->marginAfterCollapse | |
| 324 || rareNonInheritedData->textOverflow != other.rareNonInheritedData-
>textOverflow | |
| 325 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m
_wrapFlow | 323 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m
_wrapFlow |
| 326 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData
->m_wrapThrough | 324 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData
->m_wrapThrough |
| 327 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or
der | 325 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or
der |
| 328 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat
a->m_alignContent | 326 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat
a->m_alignContent |
| 329 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData-
>m_alignItems | 327 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData-
>m_alignItems |
| 330 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->
m_alignSelf | 328 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->
m_alignSelf |
| 331 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD
ata->m_justifyContent | 329 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD
ata->m_justifyContent |
| 332 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData-
>hasFilters()) | 330 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData-
>hasFilters()) |
| 333 return true; | 331 return true; |
| 334 | 332 |
| (...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1267 // right | 1265 // right |
| 1268 radiiSum = radii.topRight().height() + radii.bottomRight().height(); | 1266 radiiSum = radii.topRight().height() + radii.bottomRight().height(); |
| 1269 if (radiiSum > rect.height()) | 1267 if (radiiSum > rect.height()) |
| 1270 factor = std::min(rect.height() / radiiSum, factor); | 1268 factor = std::min(rect.height() / radiiSum, factor); |
| 1271 | 1269 |
| 1272 ASSERT(factor <= 1); | 1270 ASSERT(factor <= 1); |
| 1273 return factor; | 1271 return factor; |
| 1274 } | 1272 } |
| 1275 | 1273 |
| 1276 } // namespace blink | 1274 } // namespace blink |
| OLD | NEW |