| 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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 662 || rareInheritedData->userSelect != other.rareInheritedData->userSel
ect | 662 || rareInheritedData->userSelect != other.rareInheritedData->userSel
ect |
| 663 || rareInheritedData->m_imageRendering != other.rareInheritedData->m
_imageRendering) | 663 || rareInheritedData->m_imageRendering != other.rareInheritedData->m
_imageRendering) |
| 664 return true; | 664 return true; |
| 665 } | 665 } |
| 666 | 666 |
| 667 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 667 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
| 668 if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDr
ag | 668 if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDr
ag |
| 669 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->
m_objectFit | 669 || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->
m_objectFit |
| 670 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedD
ata->m_objectPosition | 670 || rareNonInheritedData->m_objectPosition != other.rareNonInheritedD
ata->m_objectPosition |
| 671 || !rareNonInheritedData->shadowDataEquivalent(*other.rareNonInherit
edData.get()) | 671 || !rareNonInheritedData->shadowDataEquivalent(*other.rareNonInherit
edData.get()) |
| 672 || !dataEquivalent(rareNonInheritedData->m_shapeOutside, other.rareN
onInheritedData->m_shapeOutside) | 672 || !rareNonInheritedData->shapeOutsideDataEquivalent(*other.rareNonI
nheritedData.get()) |
| 673 || !dataEquivalent(rareNonInheritedData->m_clipPath, other.rareNonIn
heritedData->m_clipPath)) | 673 || !rareNonInheritedData->clipPathDataEquivalent(*other.rareNonInher
itedData.get())) |
| 674 return true; | 674 return true; |
| 675 } | 675 } |
| 676 | 676 |
| 677 return false; | 677 return false; |
| 678 } | 678 } |
| 679 | 679 |
| 680 void RenderStyle::updatePropertySpecificDifferences(const RenderStyle& other, St
yleDifference& diff) const | 680 void RenderStyle::updatePropertySpecificDifferences(const RenderStyle& other, St
yleDifference& diff) const |
| 681 { | 681 { |
| 682 // StyleAdjuster has ensured that zIndex is non-auto only if it's applicable
. | 682 // StyleAdjuster has ensured that zIndex is non-auto only if it's applicable
. |
| 683 if (m_box->zIndex() != other.m_box->zIndex() || m_box->hasAutoZIndex() != ot
her.m_box->hasAutoZIndex()) | 683 if (m_box->zIndex() != other.m_box->zIndex() || m_box->hasAutoZIndex() != ot
her.m_box->hasAutoZIndex()) |
| (...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1755 horizontal || includeLogicalRightEdge); | 1755 horizontal || includeLogicalRightEdge); |
| 1756 | 1756 |
| 1757 edges[BSLeft] = BorderEdge(borderLeftWidth(), | 1757 edges[BSLeft] = BorderEdge(borderLeftWidth(), |
| 1758 visitedDependentColor(CSSPropertyBorderLeftColor), | 1758 visitedDependentColor(CSSPropertyBorderLeftColor), |
| 1759 borderLeftStyle(), | 1759 borderLeftStyle(), |
| 1760 borderLeftIsTransparent(), | 1760 borderLeftIsTransparent(), |
| 1761 !horizontal || includeLogicalLeftEdge); | 1761 !horizontal || includeLogicalLeftEdge); |
| 1762 } | 1762 } |
| 1763 | 1763 |
| 1764 } // namespace blink | 1764 } // namespace blink |
| OLD | NEW |