| 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 return Reattach; | 173 return Reattach; |
| 174 | 174 |
| 175 if (!oldStyle && !newStyle) | 175 if (!oldStyle && !newStyle) |
| 176 return NoChange; | 176 return NoChange; |
| 177 | 177 |
| 178 if (oldStyle->display() != newStyle->display() | 178 if (oldStyle->display() != newStyle->display() |
| 179 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI
RST_LETTER) | 179 || oldStyle->hasPseudoStyle(FIRST_LETTER) != newStyle->hasPseudoStyle(FI
RST_LETTER) |
| 180 || oldStyle->columnSpan() != newStyle->columnSpan() | 180 || oldStyle->columnSpan() != newStyle->columnSpan() |
| 181 || oldStyle->specifiesAutoColumns() != newStyle->specifiesAutoColumns() | 181 || oldStyle->specifiesAutoColumns() != newStyle->specifiesAutoColumns() |
| 182 || !oldStyle->contentDataEquivalent(newStyle) | 182 || !oldStyle->contentDataEquivalent(newStyle) |
| 183 || oldStyle->hasTextCombine() != newStyle->hasTextCombine() | 183 || oldStyle->hasTextCombine() != newStyle->hasTextCombine()) |
| 184 || oldStyle->flowThread() != newStyle->flowThread() | |
| 185 || oldStyle->regionThread() != newStyle->regionThread()) | |
| 186 return Reattach; | 184 return Reattach; |
| 187 | 185 |
| 188 if (*oldStyle == *newStyle) | 186 if (*oldStyle == *newStyle) |
| 189 return comparePseudoStyles(oldStyle, newStyle); | 187 return comparePseudoStyles(oldStyle, newStyle); |
| 190 | 188 |
| 191 if (oldStyle->inheritedNotEqual(newStyle) | 189 if (oldStyle->inheritedNotEqual(newStyle) |
| 192 || oldStyle->hasExplicitlyInheritedProperties() | 190 || oldStyle->hasExplicitlyInheritedProperties() |
| 193 || newStyle->hasExplicitlyInheritedProperties()) | 191 || newStyle->hasExplicitlyInheritedProperties()) |
| 194 return Inherit; | 192 return Inherit; |
| 195 | 193 |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 || borderRightWidth() != other->borderRightWidth()) | 408 || borderRightWidth() != other->borderRightWidth()) |
| 411 return StyleDifferenceLayout; | 409 return StyleDifferenceLayout; |
| 412 } | 410 } |
| 413 | 411 |
| 414 if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) { | 412 if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) { |
| 415 if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m
_appearance | 413 if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m
_appearance |
| 416 || rareNonInheritedData->marginBeforeCollapse != other->rareNonInher
itedData->marginBeforeCollapse | 414 || rareNonInheritedData->marginBeforeCollapse != other->rareNonInher
itedData->marginBeforeCollapse |
| 417 || rareNonInheritedData->marginAfterCollapse != other->rareNonInheri
tedData->marginAfterCollapse | 415 || rareNonInheritedData->marginAfterCollapse != other->rareNonInheri
tedData->marginAfterCollapse |
| 418 || rareNonInheritedData->lineClamp != other->rareNonInheritedData->l
ineClamp | 416 || rareNonInheritedData->lineClamp != other->rareNonInheritedData->l
ineClamp |
| 419 || rareNonInheritedData->textOverflow != other->rareNonInheritedData
->textOverflow | 417 || rareNonInheritedData->textOverflow != other->rareNonInheritedData
->textOverflow |
| 420 || rareNonInheritedData->m_regionFragment != other->rareNonInherited
Data->m_regionFragment | |
| 421 || rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->
m_wrapFlow | 418 || rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->
m_wrapFlow |
| 422 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedDat
a->m_wrapThrough | 419 || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedDat
a->m_wrapThrough |
| 423 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedDat
a->m_shapeMargin | 420 || rareNonInheritedData->m_shapeMargin != other->rareNonInheritedDat
a->m_shapeMargin |
| 424 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedDa
ta->m_shapePadding | 421 || rareNonInheritedData->m_shapePadding != other->rareNonInheritedDa
ta->m_shapePadding |
| 425 || rareNonInheritedData->m_order != other->rareNonInheritedData->m_o
rder | 422 || rareNonInheritedData->m_order != other->rareNonInheritedData->m_o
rder |
| 426 || rareNonInheritedData->m_alignContent != other->rareNonInheritedDa
ta->m_alignContent | 423 || rareNonInheritedData->m_alignContent != other->rareNonInheritedDa
ta->m_alignContent |
| 427 || rareNonInheritedData->m_alignItems != other->rareNonInheritedData
->m_alignItems | 424 || rareNonInheritedData->m_alignItems != other->rareNonInheritedData
->m_alignItems |
| 428 || rareNonInheritedData->m_alignSelf != other->rareNonInheritedData-
>m_alignSelf | 425 || rareNonInheritedData->m_alignSelf != other->rareNonInheritedData-
>m_alignSelf |
| 429 || rareNonInheritedData->m_justifyContent != other->rareNonInherited
Data->m_justifyContent | 426 || rareNonInheritedData->m_justifyContent != other->rareNonInherited
Data->m_justifyContent |
| 430 || rareNonInheritedData->m_grid.get() != other->rareNonInheritedData
->m_grid.get() | 427 || rareNonInheritedData->m_grid.get() != other->rareNonInheritedData
->m_grid.get() |
| (...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1591 } | 1588 } |
| 1592 | 1589 |
| 1593 void RenderStyle::setBorderImageOutset(const BorderImageLengthBox& outset) | 1590 void RenderStyle::setBorderImageOutset(const BorderImageLengthBox& outset) |
| 1594 { | 1591 { |
| 1595 if (surround->border.m_image.outset() == outset) | 1592 if (surround->border.m_image.outset() == outset) |
| 1596 return; | 1593 return; |
| 1597 surround.access()->border.m_image.setOutset(outset); | 1594 surround.access()->border.m_image.setOutset(outset); |
| 1598 } | 1595 } |
| 1599 | 1596 |
| 1600 } // namespace WebCore | 1597 } // namespace WebCore |
| OLD | NEW |