| 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 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 || rareInheritedData->userSelect != other.rareInheritedData->userSel
ect | 660 || rareInheritedData->userSelect != other.rareInheritedData->userSel
ect |
| 661 || rareInheritedData->m_imageRendering != other.rareInheritedData->m
_imageRendering) | 661 || rareInheritedData->m_imageRendering != other.rareInheritedData->m
_imageRendering) |
| 662 return true; | 662 return true; |
| 663 } | 663 } |
| 664 | 664 |
| 665 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 665 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
| 666 if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDr
ag | 666 if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDr
ag |
| 667 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->
m_objectFit | 667 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->
m_objectFit |
| 668 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedD
ata->m_objectPosition | 668 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedD
ata->m_objectPosition |
| 669 || !rareNonInheritedData->shapeOutsideDataEquivalent(*other.rareNonI
nheritedData.get()) | 669 || !rareNonInheritedData->shapeOutsideDataEquivalent(*other.rareNonI
nheritedData.get()) |
| 670 || !rareNonInheritedData->clipPathDataEquivalent(*other.rareNonInher
itedData.get())) | 670 || !rareNonInheritedData->clipPathDataEquivalent(*other.rareNonInher
itedData.get()) |
| 671 || (visitedLinkBorderLeftColor() != other.visitedLinkBorderLeftColor
() && borderLeftWidth()) |
| 672 || (visitedLinkBorderRightColor() != other.visitedLinkBorderRightCol
or() && borderRightWidth()) |
| 673 || (visitedLinkBorderBottomColor() != other.visitedLinkBorderBottomC
olor() && borderBottomWidth()) |
| 674 || (visitedLinkBorderTopColor() != other.visitedLinkBorderTopColor()
&& borderTopWidth()) |
| 675 || (visitedLinkOutlineColor() != other.visitedLinkOutlineColor() &&
outlineWidth()) |
| 676 || (visitedLinkBackgroundColor() != other.visitedLinkBackgroundColor
())) |
| 671 return true; | 677 return true; |
| 672 } | 678 } |
| 673 | 679 |
| 674 if (resize() != other.resize()) | 680 if (resize() != other.resize()) |
| 675 return true; | 681 return true; |
| 676 | 682 |
| 677 return false; | 683 return false; |
| 678 } | 684 } |
| 679 | 685 |
| 680 void LayoutStyle::updatePropertySpecificDifferences(const LayoutStyle& other, St
yleDifference& diff) const | 686 void LayoutStyle::updatePropertySpecificDifferences(const LayoutStyle& other, St
yleDifference& diff) const |
| (...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1666 horizontal || includeLogicalRightEdge); | 1672 horizontal || includeLogicalRightEdge); |
| 1667 | 1673 |
| 1668 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1674 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
| 1669 visitedDependentColor(CSSPropertyBorderLeftColor), | 1675 visitedDependentColor(CSSPropertyBorderLeftColor), |
| 1670 borderLeftStyle(), | 1676 borderLeftStyle(), |
| 1671 borderLeftIsTransparent(), | 1677 borderLeftIsTransparent(), |
| 1672 !horizontal || includeLogicalLeftEdge); | 1678 !horizontal || includeLogicalLeftEdge); |
| 1673 } | 1679 } |
| 1674 | 1680 |
| 1675 } // namespace blink | 1681 } // namespace blink |
| OLD | NEW |