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 | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
4 * reserved. | 4 * reserved. |
5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1099 m_rareInheritedData->textEmphasisColor() != | 1099 m_rareInheritedData->textEmphasisColor() != |
1100 other.m_rareInheritedData->textEmphasisColor() || | 1100 other.m_rareInheritedData->textEmphasisColor() || |
1101 m_rareInheritedData->visitedLinkTextFillColor() != | 1101 m_rareInheritedData->visitedLinkTextFillColor() != |
1102 other.m_rareInheritedData->visitedLinkTextFillColor() || | 1102 other.m_rareInheritedData->visitedLinkTextFillColor() || |
1103 m_rareInheritedData->visitedLinkTextStrokeColor() != | 1103 m_rareInheritedData->visitedLinkTextStrokeColor() != |
1104 other.m_rareInheritedData->visitedLinkTextStrokeColor() || | 1104 other.m_rareInheritedData->visitedLinkTextStrokeColor() || |
1105 m_rareInheritedData->visitedLinkTextEmphasisColor() != | 1105 m_rareInheritedData->visitedLinkTextEmphasisColor() != |
1106 other.m_rareInheritedData->visitedLinkTextEmphasisColor() || | 1106 other.m_rareInheritedData->visitedLinkTextEmphasisColor() || |
1107 m_rareInheritedData->textEmphasisFill != | 1107 m_rareInheritedData->textEmphasisFill != |
1108 other.m_rareInheritedData->textEmphasisFill || | 1108 other.m_rareInheritedData->textEmphasisFill || |
| 1109 m_rareInheritedData->m_textDecorationSkip != |
| 1110 other.m_rareInheritedData->m_textDecorationSkip || |
1109 m_rareInheritedData->appliedTextDecorations != | 1111 m_rareInheritedData->appliedTextDecorations != |
1110 other.m_rareInheritedData->appliedTextDecorations)) { | 1112 other.m_rareInheritedData->appliedTextDecorations)) { |
1111 diff.setTextDecorationOrColorChanged(); | 1113 diff.setTextDecorationOrColorChanged(); |
1112 } | 1114 } |
1113 } | 1115 } |
1114 } | 1116 } |
1115 | 1117 |
1116 void ComputedStyle::addPaintImage(StyleImage* image) { | 1118 void ComputedStyle::addPaintImage(StyleImage* image) { |
1117 if (!m_rareNonInheritedData.access()->m_paintImages) | 1119 if (!m_rareNonInheritedData.access()->m_paintImages) |
1118 m_rareNonInheritedData.access()->m_paintImages = | 1120 m_rareNonInheritedData.access()->m_paintImages = |
(...skipping 1229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2348 if (value < 0) | 2350 if (value < 0) |
2349 fvalue -= 0.5f; | 2351 fvalue -= 0.5f; |
2350 else | 2352 else |
2351 fvalue += 0.5f; | 2353 fvalue += 0.5f; |
2352 } | 2354 } |
2353 | 2355 |
2354 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2356 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
2355 } | 2357 } |
2356 | 2358 |
2357 } // namespace blink | 2359 } // namespace blink |
OLD | NEW |