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 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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->visitedLinkColor != other.inherited->visitedLinkColor |
700 || inherited_flags.m_textUnderline != other.inherited_flags.m_textUn
derline | 700 || inherited_flags.m_textUnderline != other.inherited_flags.m_textUn
derline |
701 || visual->textDecoration != other.visual->textDecoration) { | 701 || visual->textDecoration != other.visual->textDecoration) { |
702 diff.setTextOrColorChanged(); | 702 diff.setTextOrColorChanged(); |
703 } else if (rareNonInheritedData.get() != other.rareNonInheritedData.get(
)) { | 703 } else if (rareNonInheritedData.get() != other.rareNonInheritedData.get(
)) { |
704 if (rareNonInheritedData->m_textDecorationStyle != other.rareNonInhe
ritedData->m_textDecorationStyle | 704 if (rareNonInheritedData->m_textDecorationStyle != other.rareNonInhe
ritedData->m_textDecorationStyle |
705 || rareNonInheritedData->m_textDecorationColor != other.rareNonI
nheritedData->m_textDecorationColor) | 705 || rareNonInheritedData->m_textDecorationColor != other.rareNonI
nheritedData->m_textDecorationColor |
| 706 || rareNonInheritedData->m_visitedLinkTextDecorationColor != oth
er.rareNonInheritedData->m_visitedLinkTextDecorationColor) |
706 diff.setTextOrColorChanged(); | 707 diff.setTextOrColorChanged(); |
707 } else if (rareInheritedData.get() != other.rareInheritedData.get()) { | 708 } else if (rareInheritedData.get() != other.rareInheritedData.get()) { |
708 if (rareInheritedData->textFillColor() != other.rareInheritedData->t
extFillColor() | 709 if (rareInheritedData->textFillColor() != other.rareInheritedData->t
extFillColor() |
709 || rareInheritedData->textStrokeColor() != other.rareInheritedDa
ta->textStrokeColor() | 710 || rareInheritedData->textStrokeColor() != other.rareInheritedDa
ta->textStrokeColor() |
710 || rareInheritedData->textEmphasisColor() != other.rareInherited
Data->textEmphasisColor() | 711 || rareInheritedData->textEmphasisColor() != other.rareInherited
Data->textEmphasisColor() |
| 712 || rareInheritedData->visitedLinkTextFillColor() != other.rareIn
heritedData->visitedLinkTextFillColor() |
| 713 || rareInheritedData->visitedLinkTextStrokeColor() != other.rare
InheritedData->visitedLinkTextStrokeColor() |
| 714 || rareInheritedData->visitedLinkTextEmphasisColor() != other.ra
reInheritedData->visitedLinkTextEmphasisColor() |
711 || rareInheritedData->textEmphasisFill != other.rareInheritedDat
a->textEmphasisFill | 715 || rareInheritedData->textEmphasisFill != other.rareInheritedDat
a->textEmphasisFill |
712 || rareInheritedData->appliedTextDecorations != other.rareInheri
tedData->appliedTextDecorations) | 716 || rareInheritedData->appliedTextDecorations != other.rareInheri
tedData->appliedTextDecorations) |
713 diff.setTextOrColorChanged(); | 717 diff.setTextOrColorChanged(); |
714 } | 718 } |
715 } | 719 } |
716 } | 720 } |
717 | 721 |
718 void LayoutStyle::addCursor(PassRefPtr<StyleImage> image, bool hotSpotSpecified,
const IntPoint& hotSpot) | 722 void LayoutStyle::addCursor(PassRefPtr<StyleImage> image, bool hotSpotSpecified,
const IntPoint& hotSpot) |
719 { | 723 { |
720 if (!rareInheritedData.access()->cursorData) | 724 if (!rareInheritedData.access()->cursorData) |
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1666 horizontal || includeLogicalRightEdge); | 1670 horizontal || includeLogicalRightEdge); |
1667 | 1671 |
1668 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1672 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
1669 visitedDependentColor(CSSPropertyBorderLeftColor), | 1673 visitedDependentColor(CSSPropertyBorderLeftColor), |
1670 borderLeftStyle(), | 1674 borderLeftStyle(), |
1671 borderLeftIsTransparent(), | 1675 borderLeftIsTransparent(), |
1672 !horizontal || includeLogicalLeftEdge); | 1676 !horizontal || includeLogicalLeftEdge); |
1673 } | 1677 } |
1674 | 1678 |
1675 } // namespace blink | 1679 } // namespace blink |
OLD | NEW |