| 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 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 | 689 |
| 690 if (rareNonInheritedData->opacity != other.rareNonInheritedData->opacity
) | 690 if (rareNonInheritedData->opacity != other.rareNonInheritedData->opacity
) |
| 691 diff.setOpacityChanged(); | 691 diff.setOpacityChanged(); |
| 692 | 692 |
| 693 if (rareNonInheritedData->m_filter != other.rareNonInheritedData->m_filt
er) | 693 if (rareNonInheritedData->m_filter != other.rareNonInheritedData->m_filt
er) |
| 694 diff.setFilterChanged(); | 694 diff.setFilterChanged(); |
| 695 } | 695 } |
| 696 | 696 |
| 697 if (!diff.needsPaintInvalidation()) { | 697 if (!diff.needsPaintInvalidation()) { |
| 698 if (inherited->color != other.inherited->color | 698 if (inherited->color != other.inherited->color |
| 699 || inherited->visitedLinkColor != other.inherited->visitedLinkColor |
| 699 || inherited_flags.m_textUnderline != other.inherited_flags.m_textUn
derline | 700 || inherited_flags.m_textUnderline != other.inherited_flags.m_textUn
derline |
| 700 || visual->textDecoration != other.visual->textDecoration) { | 701 || visual->textDecoration != other.visual->textDecoration) { |
| 701 diff.setTextOrColorChanged(); | 702 diff.setTextOrColorChanged(); |
| 702 } else if (rareNonInheritedData.get() != other.rareNonInheritedData.get(
)) { | 703 } else if (rareNonInheritedData.get() != other.rareNonInheritedData.get(
)) { |
| 703 if (rareNonInheritedData->m_textDecorationStyle != other.rareNonInhe
ritedData->m_textDecorationStyle | 704 if (rareNonInheritedData->m_textDecorationStyle != other.rareNonInhe
ritedData->m_textDecorationStyle |
| 704 || rareNonInheritedData->m_textDecorationColor != other.rareNonI
nheritedData->m_textDecorationColor) | 705 || rareNonInheritedData->m_textDecorationColor != other.rareNonI
nheritedData->m_textDecorationColor) |
| 705 diff.setTextOrColorChanged(); | 706 diff.setTextOrColorChanged(); |
| 706 } else if (rareInheritedData.get() != other.rareInheritedData.get()) { | 707 } else if (rareInheritedData.get() != other.rareInheritedData.get()) { |
| 707 if (rareInheritedData->textFillColor() != other.rareInheritedData->t
extFillColor() | 708 if (rareInheritedData->textFillColor() != other.rareInheritedData->t
extFillColor() |
| 708 || rareInheritedData->textStrokeColor() != other.rareInheritedDa
ta->textStrokeColor() | 709 || rareInheritedData->textStrokeColor() != other.rareInheritedDa
ta->textStrokeColor() |
| (...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1665 horizontal || includeLogicalRightEdge); | 1666 horizontal || includeLogicalRightEdge); |
| 1666 | 1667 |
| 1667 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1668 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
| 1668 visitedDependentColor(CSSPropertyBorderLeftColor), | 1669 visitedDependentColor(CSSPropertyBorderLeftColor), |
| 1669 borderLeftStyle(), | 1670 borderLeftStyle(), |
| 1670 borderLeftIsTransparent(), | 1671 borderLeftIsTransparent(), |
| 1671 !horizontal || includeLogicalLeftEdge); | 1672 !horizontal || includeLogicalLeftEdge); |
| 1672 } | 1673 } |
| 1673 | 1674 |
| 1674 } // namespace blink | 1675 } // namespace blink |
| OLD | NEW |