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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
451 return true; | 451 return true; |
452 | 452 |
453 if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.rareNon
InheritedData->m_deprecatedFlexibleBox.get() | 453 if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other.rareNon
InheritedData->m_deprecatedFlexibleBox.get() |
454 && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other.ra
reNonInheritedData->m_deprecatedFlexibleBox.get()) | 454 && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other.ra
reNonInheritedData->m_deprecatedFlexibleBox.get()) |
455 return true; | 455 return true; |
456 | 456 |
457 if (rareNonInheritedData->m_flexibleBox.get() != other.rareNonInheritedD
ata->m_flexibleBox.get() | 457 if (rareNonInheritedData->m_flexibleBox.get() != other.rareNonInheritedD
ata->m_flexibleBox.get() |
458 && *rareNonInheritedData->m_flexibleBox.get() != *other.rareNonInher
itedData->m_flexibleBox.get()) | 458 && *rareNonInheritedData->m_flexibleBox.get() != *other.rareNonInher
itedData->m_flexibleBox.get()) |
459 return true; | 459 return true; |
460 | 460 |
461 // FIXME: We should add an optimized form of layout that just recomputes
visual overflow. | |
462 if (!rareNonInheritedData->shadowDataEquivalent(*other.rareNonInheritedD
ata.get())) | |
463 return true; | |
464 | |
465 if (!rareNonInheritedData->reflectionDataEquivalent(*other.rareNonInheri
tedData.get())) | 461 if (!rareNonInheritedData->reflectionDataEquivalent(*other.rareNonInheri
tedData.get())) |
466 return true; | 462 return true; |
467 | 463 |
468 if (rareNonInheritedData->m_multiCol.get() != other.rareNonInheritedData
->m_multiCol.get() | 464 if (rareNonInheritedData->m_multiCol.get() != other.rareNonInheritedData
->m_multiCol.get() |
469 && *rareNonInheritedData->m_multiCol.get() != *other.rareNonInherite
dData->m_multiCol.get()) | 465 && *rareNonInheritedData->m_multiCol.get() != *other.rareNonInherite
dData->m_multiCol.get()) |
470 return true; | 466 return true; |
471 | 467 |
472 // If the counter directives change, trigger a relayout to re-calculate
counter values and rebuild the counter node tree. | 468 // If the counter directives change, trigger a relayout to re-calculate
counter values and rebuild the counter node tree. |
473 const CounterDirectiveMap* mapA = rareNonInheritedData->m_counterDirecti
ves.get(); | 469 const CounterDirectiveMap* mapA = rareNonInheritedData->m_counterDirecti
ves.get(); |
474 const CounterDirectiveMap* mapB = other.rareNonInheritedData->m_counterD
irectives.get(); | 470 const CounterDirectiveMap* mapB = other.rareNonInheritedData->m_counterD
irectives.get(); |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
657 || rareInheritedData->userSelect != other.rareInheritedData->userSel
ect | 653 || rareInheritedData->userSelect != other.rareInheritedData->userSel
ect |
658 || rareInheritedData->m_imageRendering != other.rareInheritedData->m
_imageRendering) | 654 || rareInheritedData->m_imageRendering != other.rareInheritedData->m
_imageRendering) |
659 return true; | 655 return true; |
660 } | 656 } |
661 | 657 |
662 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 658 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
663 if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDr
ag | 659 if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDr
ag |
664 || rareNonInheritedData->m_borderFit != other.rareNonInheritedData->
m_borderFit | 660 || rareNonInheritedData->m_borderFit != other.rareNonInheritedData->
m_borderFit |
665 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->
m_objectFit | 661 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->
m_objectFit |
666 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedD
ata->m_objectPosition | 662 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedD
ata->m_objectPosition |
| 663 || !rareNonInheritedData->shadowDataEquivalent(*other.rareNonInherit
edData.get()) |
667 || !dataEquivalent(rareNonInheritedData->m_shapeOutside, other.rareN
onInheritedData->m_shapeOutside) | 664 || !dataEquivalent(rareNonInheritedData->m_shapeOutside, other.rareN
onInheritedData->m_shapeOutside) |
668 || !dataEquivalent(rareNonInheritedData->m_clipPath, other.rareNonIn
heritedData->m_clipPath)) | 665 || !dataEquivalent(rareNonInheritedData->m_clipPath, other.rareNonIn
heritedData->m_clipPath)) |
669 return true; | 666 return true; |
670 } | 667 } |
671 | 668 |
672 return false; | 669 return false; |
673 } | 670 } |
674 | 671 |
675 void RenderStyle::updatePropertySpecificDifferences(const RenderStyle& other, St
yleDifference& diff) const | 672 void RenderStyle::updatePropertySpecificDifferences(const RenderStyle& other, St
yleDifference& diff) const |
676 { | 673 { |
(...skipping 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1744 horizontal || includeLogicalRightEdge); | 1741 horizontal || includeLogicalRightEdge); |
1745 | 1742 |
1746 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1743 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
1747 visitedDependentColor(CSSPropertyBorderLeftColor), | 1744 visitedDependentColor(CSSPropertyBorderLeftColor), |
1748 borderLeftStyle(), | 1745 borderLeftStyle(), |
1749 borderLeftIsTransparent(), | 1746 borderLeftIsTransparent(), |
1750 !horizontal || includeLogicalLeftEdge); | 1747 !horizontal || includeLogicalLeftEdge); |
1751 } | 1748 } |
1752 | 1749 |
1753 } // namespace blink | 1750 } // namespace blink |
OLD | NEW |