| 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 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 || hasWillChangeCompositingHint() != other->hasWillChangeCompositing
Hint() | 655 || hasWillChangeCompositingHint() != other->hasWillChangeCompositing
Hint() |
| 656 || hasWillChangeGpuRasterizationHint() != other->hasWillChangeGpuRas
terizationHint()) | 656 || hasWillChangeGpuRasterizationHint() != other->hasWillChangeGpuRas
terizationHint()) |
| 657 return StyleDifferenceRecompositeLayer; | 657 return StyleDifferenceRecompositeLayer; |
| 658 } | 658 } |
| 659 | 659 |
| 660 if (inherited->color != other->inherited->color | 660 if (inherited->color != other->inherited->color |
| 661 || inherited_flags._text_decorations != other->inherited_flags._text_dec
orations | 661 || inherited_flags._text_decorations != other->inherited_flags._text_dec
orations |
| 662 || visual->textDecoration != other->visual->textDecoration | 662 || visual->textDecoration != other->visual->textDecoration |
| 663 || rareNonInheritedData->m_textDecorationStyle != other->rareNonInherite
dData->m_textDecorationStyle | 663 || rareNonInheritedData->m_textDecorationStyle != other->rareNonInherite
dData->m_textDecorationStyle |
| 664 || rareNonInheritedData->m_textDecorationColor != other->rareNonInherite
dData->m_textDecorationColor | 664 || rareNonInheritedData->m_textDecorationColor != other->rareNonInherite
dData->m_textDecorationColor |
| 665 || rareInheritedData->textFillColor != other->rareInheritedData->textFil
lColor | 665 || rareInheritedData->textFillColor() != other->rareInheritedData->textF
illColor() |
| 666 || rareInheritedData->textStrokeColor != other->rareInheritedData->textS
trokeColor | 666 || rareInheritedData->textStrokeColor() != other->rareInheritedData->tex
tStrokeColor() |
| 667 || rareInheritedData->textEmphasisColor != other->rareInheritedData->tex
tEmphasisColor | 667 || rareInheritedData->textEmphasisColor() != other->rareInheritedData->t
extEmphasisColor() |
| 668 || rareInheritedData->textEmphasisFill != other->rareInheritedData->text
EmphasisFill) | 668 || rareInheritedData->textEmphasisFill != other->rareInheritedData->text
EmphasisFill) |
| 669 return StyleDifferenceRepaintIfTextOrColorChange; | 669 return StyleDifferenceRepaintIfTextOrColorChange; |
| 670 | 670 |
| 671 // Cursors are not checked, since they will be set appropriately in response
to mouse events, | 671 // Cursors are not checked, since they will be set appropriately in response
to mouse events, |
| 672 // so they don't need to cause any repaint or layout. | 672 // so they don't need to cause any repaint or layout. |
| 673 | 673 |
| 674 // Animations don't need to be checked either. We always set the new style
on the RenderObject, so we will get a chance to fire off | 674 // Animations don't need to be checked either. We always set the new style
on the RenderObject, so we will get a chance to fire off |
| 675 // the resulting transition properly. | 675 // the resulting transition properly. |
| 676 return StyleDifferenceEqual; | 676 return StyleDifferenceEqual; |
| 677 } | 677 } |
| (...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |