| 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 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 | 415 |
| 416 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 416 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
| 417 if (rareNonInheritedData->m_appearance != other.rareNonInheritedData->m_
appearance | 417 if (rareNonInheritedData->m_appearance != other.rareNonInheritedData->m_
appearance |
| 418 || rareNonInheritedData->marginBeforeCollapse != other.rareNonInheri
tedData->marginBeforeCollapse | 418 || rareNonInheritedData->marginBeforeCollapse != other.rareNonInheri
tedData->marginBeforeCollapse |
| 419 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit
edData->marginAfterCollapse | 419 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit
edData->marginAfterCollapse |
| 420 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li
neClamp | 420 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li
neClamp |
| 421 || rareNonInheritedData->textOverflow != other.rareNonInheritedData-
>textOverflow | 421 || rareNonInheritedData->textOverflow != other.rareNonInheritedData-
>textOverflow |
| 422 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m
_wrapFlow | 422 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m
_wrapFlow |
| 423 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData
->m_wrapThrough | 423 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData
->m_wrapThrough |
| 424 || rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData
->m_shapeMargin | 424 || rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData
->m_shapeMargin |
| 425 || rareNonInheritedData->m_shapePadding != other.rareNonInheritedDat
a->m_shapePadding | |
| 426 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or
der | 425 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or
der |
| 427 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat
a->m_alignContent | 426 || rareNonInheritedData->m_alignContent != other.rareNonInheritedDat
a->m_alignContent |
| 428 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData-
>m_alignItems | 427 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData-
>m_alignItems |
| 429 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->
m_alignSelf | 428 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->
m_alignSelf |
| 430 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD
ata->m_justifyContent | 429 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD
ata->m_justifyContent |
| 431 || rareNonInheritedData->m_grid.get() != other.rareNonInheritedData-
>m_grid.get() | 430 || rareNonInheritedData->m_grid.get() != other.rareNonInheritedData-
>m_grid.get() |
| 432 || rareNonInheritedData->m_gridItem.get() != other.rareNonInheritedD
ata->m_gridItem.get() | 431 || rareNonInheritedData->m_gridItem.get() != other.rareNonInheritedD
ata->m_gridItem.get() |
| 433 || rareNonInheritedData->m_textCombine != other.rareNonInheritedData
->m_textCombine | 432 || rareNonInheritedData->m_textCombine != other.rareNonInheritedData
->m_textCombine |
| 434 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData-
>hasFilters()) | 433 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData-
>hasFilters()) |
| 435 return StyleDifferenceLayout; | 434 return StyleDifferenceLayout; |
| (...skipping 1219 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 |