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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 StyleRecalcChange ComputedStyle::stylePropagationDiff(const ComputedStyle* oldSt
yle, const ComputedStyle* newStyle) | 169 StyleRecalcChange ComputedStyle::stylePropagationDiff(const ComputedStyle* oldSt
yle, const ComputedStyle* newStyle) |
170 { | 170 { |
171 if ((!oldStyle && newStyle) || (oldStyle && !newStyle)) | 171 if ((!oldStyle && newStyle) || (oldStyle && !newStyle)) |
172 return Reattach; | 172 return Reattach; |
173 | 173 |
174 if (!oldStyle && !newStyle) | 174 if (!oldStyle && !newStyle) |
175 return NoChange; | 175 return NoChange; |
176 | 176 |
177 if (oldStyle->display() != newStyle->display() | 177 if (oldStyle->display() != newStyle->display() |
178 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI
RST_LETTER) | 178 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI
RST_LETTER) |
179 || oldStyle->columnSpan() != newStyle->columnSpan() | |
180 || !oldStyle->contentDataEquivalent(newStyle) | 179 || !oldStyle->contentDataEquivalent(newStyle) |
181 || oldStyle->hasTextCombine() != newStyle->hasTextCombine() | 180 || oldStyle->hasTextCombine() != newStyle->hasTextCombine() |
182 || oldStyle->justifyItems() != newStyle->justifyItems() | 181 || oldStyle->justifyItems() != newStyle->justifyItems() |
183 || oldStyle->alignItems() != newStyle->alignItems()) | 182 || oldStyle->alignItems() != newStyle->alignItems()) |
184 return Reattach; | 183 return Reattach; |
185 | 184 |
186 if (oldStyle->inheritedNotEqual(*newStyle)) | 185 if (oldStyle->inheritedNotEqual(*newStyle)) |
187 return Inherit; | 186 return Inherit; |
188 | 187 |
189 if (*oldStyle == *newStyle) | 188 if (*oldStyle == *newStyle) |
(...skipping 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1739 } | 1738 } |
1740 | 1739 |
1741 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) | 1740 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) |
1742 { | 1741 { |
1743 setEmptyState(other.emptyState()); | 1742 setEmptyState(other.emptyState()); |
1744 if (other.hasExplicitlyInheritedProperties()) | 1743 if (other.hasExplicitlyInheritedProperties()) |
1745 setHasExplicitlyInheritedProperties(); | 1744 setHasExplicitlyInheritedProperties(); |
1746 } | 1745 } |
1747 | 1746 |
1748 } // namespace blink | 1747 } // namespace blink |
OLD | NEW |