| 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 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedDat
a->m_wrapThrough | 423 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedDat
a->m_wrapThrough |
| 424 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedDat
a->m_shapeMargin | 424 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedDat
a->m_shapeMargin |
| 425 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedDa
ta->m_shapePadding | 425 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedDa
ta->m_shapePadding |
| 426 || rareNonInheritedData->m_order != other->rareNonInheritedData->m_o
rder | 426 || rareNonInheritedData->m_order != other->rareNonInheritedData->m_o
rder |
| 427 || rareNonInheritedData->m_alignContent != other->rareNonInheritedDa
ta->m_alignContent | 427 || rareNonInheritedData->m_alignContent != other->rareNonInheritedDa
ta->m_alignContent |
| 428 || rareNonInheritedData->m_alignItems != other->rareNonInheritedData
->m_alignItems | 428 || rareNonInheritedData->m_alignItems != other->rareNonInheritedData
->m_alignItems |
| 429 || rareNonInheritedData->m_alignSelf != other->rareNonInheritedData-
>m_alignSelf | 429 || rareNonInheritedData->m_alignSelf != other->rareNonInheritedData-
>m_alignSelf |
| 430 || rareNonInheritedData->m_justifyContent != other->rareNonInherited
Data->m_justifyContent | 430 || rareNonInheritedData->m_justifyContent != other->rareNonInherited
Data->m_justifyContent |
| 431 || rareNonInheritedData->m_grid.get() != other->rareNonInheritedData
->m_grid.get() | 431 || rareNonInheritedData->m_grid.get() != other->rareNonInheritedData
->m_grid.get() |
| 432 || rareNonInheritedData->m_gridItem.get() != other->rareNonInherited
Data->m_gridItem.get() | 432 || rareNonInheritedData->m_gridItem.get() != other->rareNonInherited
Data->m_gridItem.get() |
| 433 || rareNonInheritedData->m_shapeInside != other->rareNonInheritedDat
a->m_shapeInside | |
| 434 || rareNonInheritedData->m_textCombine != other->rareNonInheritedDat
a->m_textCombine | 433 || rareNonInheritedData->m_textCombine != other->rareNonInheritedDat
a->m_textCombine |
| 435 || rareNonInheritedData->hasFilters() != other->rareNonInheritedData
->hasFilters()) | 434 || rareNonInheritedData->hasFilters() != other->rareNonInheritedData
->hasFilters()) |
| 436 return StyleDifferenceLayout; | 435 return StyleDifferenceLayout; |
| 437 | 436 |
| 438 if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other->rareNo
nInheritedData->m_deprecatedFlexibleBox.get() | 437 if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other->rareNo
nInheritedData->m_deprecatedFlexibleBox.get() |
| 439 && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other->r
areNonInheritedData->m_deprecatedFlexibleBox.get()) | 438 && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other->r
areNonInheritedData->m_deprecatedFlexibleBox.get()) |
| 440 return StyleDifferenceLayout; | 439 return StyleDifferenceLayout; |
| 441 | 440 |
| 442 if (rareNonInheritedData->m_flexibleBox.get() != other->rareNonInherited
Data->m_flexibleBox.get() | 441 if (rareNonInheritedData->m_flexibleBox.get() != other->rareNonInherited
Data->m_flexibleBox.get() |
| 443 && *rareNonInheritedData->m_flexibleBox.get() != *other->rareNonInhe
ritedData->m_flexibleBox.get()) | 442 && *rareNonInheritedData->m_flexibleBox.get() != *other->rareNonInhe
ritedData->m_flexibleBox.get()) |
| (...skipping 1211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1655 // right | 1654 // right |
| 1656 radiiSum = radii.topRight().height() + radii.bottomRight().height(); | 1655 radiiSum = radii.topRight().height() + radii.bottomRight().height(); |
| 1657 if (radiiSum > rect.height()) | 1656 if (radiiSum > rect.height()) |
| 1658 factor = std::min(rect.height() / radiiSum, factor); | 1657 factor = std::min(rect.height() / radiiSum, factor); |
| 1659 | 1658 |
| 1660 ASSERT(factor <= 1); | 1659 ASSERT(factor <= 1); |
| 1661 return factor; | 1660 return factor; |
| 1662 } | 1661 } |
| 1663 | 1662 |
| 1664 } // namespace WebCore | 1663 } // namespace WebCore |
| OLD | NEW |