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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 return Reattach; | 171 return Reattach; |
172 | 172 |
173 if (!oldStyle && !newStyle) | 173 if (!oldStyle && !newStyle) |
174 return NoChange; | 174 return NoChange; |
175 | 175 |
176 if (oldStyle->display() != newStyle->display() | 176 if (oldStyle->display() != newStyle->display() |
177 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI
RST_LETTER) | 177 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI
RST_LETTER) |
178 || oldStyle->columnSpan() != newStyle->columnSpan() | 178 || oldStyle->columnSpan() != newStyle->columnSpan() |
179 || !oldStyle->contentDataEquivalent(newStyle) | 179 || !oldStyle->contentDataEquivalent(newStyle) |
180 || oldStyle->hasTextCombine() != newStyle->hasTextCombine() | 180 || oldStyle->hasTextCombine() != newStyle->hasTextCombine() |
181 || oldStyle->justifyItems() != newStyle->justifyItems() | 181 || oldStyle->justifyItemsData() != newStyle->justifyItemsData() |
182 || oldStyle->alignItems() != newStyle->alignItems()) | 182 || oldStyle->alignItemsData() != newStyle->alignItemsData()) |
183 return Reattach; | 183 return Reattach; |
184 | 184 |
185 if (oldStyle->inheritedNotEqual(*newStyle)) | 185 if (oldStyle->inheritedNotEqual(*newStyle)) |
186 return Inherit; | 186 return Inherit; |
187 | 187 |
188 if (*oldStyle == *newStyle) | 188 if (*oldStyle == *newStyle) |
189 return diffPseudoStyles(*oldStyle, *newStyle); | 189 return diffPseudoStyles(*oldStyle, *newStyle); |
190 | 190 |
191 if (oldStyle->hasExplicitlyInheritedProperties()) | 191 if (oldStyle->hasExplicitlyInheritedProperties()) |
192 return Inherit; | 192 return Inherit; |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
461 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 461 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
462 if (rareNonInheritedData->m_appearance != other.rareNonInheritedData->m_
appearance | 462 if (rareNonInheritedData->m_appearance != other.rareNonInheritedData->m_
appearance |
463 || rareNonInheritedData->marginBeforeCollapse != other.rareNonInheri
tedData->marginBeforeCollapse | 463 || rareNonInheritedData->marginBeforeCollapse != other.rareNonInheri
tedData->marginBeforeCollapse |
464 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit
edData->marginAfterCollapse | 464 || rareNonInheritedData->marginAfterCollapse != other.rareNonInherit
edData->marginAfterCollapse |
465 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li
neClamp | 465 || rareNonInheritedData->lineClamp != other.rareNonInheritedData->li
neClamp |
466 || rareNonInheritedData->textOverflow != other.rareNonInheritedData-
>textOverflow | 466 || rareNonInheritedData->textOverflow != other.rareNonInheritedData-
>textOverflow |
467 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m
_wrapFlow | 467 || rareNonInheritedData->m_wrapFlow != other.rareNonInheritedData->m
_wrapFlow |
468 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData
->m_wrapThrough | 468 || rareNonInheritedData->m_wrapThrough != other.rareNonInheritedData
->m_wrapThrough |
469 || rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData
->m_shapeMargin | 469 || rareNonInheritedData->m_shapeMargin != other.rareNonInheritedData
->m_shapeMargin |
470 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or
der | 470 || rareNonInheritedData->m_order != other.rareNonInheritedData->m_or
der |
471 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD
ata->m_justifyContent | |
472 || rareNonInheritedData->m_grid.get() != other.rareNonInheritedData-
>m_grid.get() | 471 || rareNonInheritedData->m_grid.get() != other.rareNonInheritedData-
>m_grid.get() |
473 || rareNonInheritedData->m_gridItem.get() != other.rareNonInheritedD
ata->m_gridItem.get() | 472 || rareNonInheritedData->m_gridItem.get() != other.rareNonInheritedD
ata->m_gridItem.get() |
474 || rareNonInheritedData->m_textCombine != other.rareNonInheritedData
->m_textCombine | 473 || rareNonInheritedData->m_textCombine != other.rareNonInheritedData
->m_textCombine |
475 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData-
>hasFilters()) | 474 || rareNonInheritedData->hasFilters() != other.rareNonInheritedData-
>hasFilters()) |
476 return true; | 475 return true; |
477 | 476 |
478 if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.rareNon
InheritedData->m_deprecatedFlexibleBox.get() | 477 if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.rareNon
InheritedData->m_deprecatedFlexibleBox.get() |
479 && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other.ra
reNonInheritedData->m_deprecatedFlexibleBox.get()) | 478 && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other.ra
reNonInheritedData->m_deprecatedFlexibleBox.get()) |
480 return true; | 479 return true; |
481 | 480 |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
640 || noninherited_flags.position != other.noninherited_flags.position) | 639 || noninherited_flags.position != other.noninherited_flags.position) |
641 return true; | 640 return true; |
642 | 641 |
643 if (surround.get() != other.surround.get()) { | 642 if (surround.get() != other.surround.get()) { |
644 if (surround->padding != other.surround->padding) | 643 if (surround->padding != other.surround->padding) |
645 return true; | 644 return true; |
646 } | 645 } |
647 | 646 |
648 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 647 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
649 if (rareNonInheritedData->m_alignContent != other.rareNonInheritedData->
m_alignContent | 648 if (rareNonInheritedData->m_alignContent != other.rareNonInheritedData->
m_alignContent |
650 || rareNonInheritedData->m_alignContentDistribution != other.rareNon
InheritedData->m_alignContentDistribution | |
651 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData-
>m_alignItems | 649 || rareNonInheritedData->m_alignItems != other.rareNonInheritedData-
>m_alignItems |
652 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->
m_alignSelf) | 650 || rareNonInheritedData->m_alignSelf != other.rareNonInheritedData->
m_alignSelf |
| 651 || rareNonInheritedData->m_justifyContent != other.rareNonInheritedD
ata->m_justifyContent |
| 652 || rareNonInheritedData->m_justifyItems != other.rareNonInheritedDat
a->m_justifyItems |
| 653 || rareNonInheritedData->m_justifySelf != other.rareNonInheritedData
->m_justifySelf) |
653 return true; | 654 return true; |
654 } | 655 } |
655 | 656 |
656 return false; | 657 return false; |
657 } | 658 } |
658 | 659 |
659 bool ComputedStyle::diffNeedsPaintInvalidationLayer(const ComputedStyle& other)
const | 660 bool ComputedStyle::diffNeedsPaintInvalidationLayer(const ComputedStyle& other)
const |
660 { | 661 { |
661 if (position() != StaticPosition && (visual->clip != other.visual->clip || v
isual->hasAutoClip != other.visual->hasAutoClip)) | 662 if (position() != StaticPosition && (visual->clip != other.visual->clip || v
isual->hasAutoClip != other.visual->hasAutoClip)) |
662 return true; | 663 return true; |
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1722 horizontal || includeLogicalRightEdge); | 1723 horizontal || includeLogicalRightEdge); |
1723 | 1724 |
1724 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1725 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
1725 visitedDependentColor(CSSPropertyBorderLeftColor), | 1726 visitedDependentColor(CSSPropertyBorderLeftColor), |
1726 borderLeftStyle(), | 1727 borderLeftStyle(), |
1727 borderLeftIsTransparent(), | 1728 borderLeftIsTransparent(), |
1728 !horizontal || includeLogicalLeftEdge); | 1729 !horizontal || includeLogicalLeftEdge); |
1729 } | 1730 } |
1730 | 1731 |
1731 } // namespace blink | 1732 } // namespace blink |
OLD | NEW |