| 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 return StyleDifferenceLayout; | 428 return StyleDifferenceLayout; |
| 429 | 429 |
| 430 if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData->
m_shapeInside) | 430 if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData->
m_shapeInside) |
| 431 return StyleDifferenceLayout; | 431 return StyleDifferenceLayout; |
| 432 } | 432 } |
| 433 | 433 |
| 434 if (rareInheritedData.get() != other->rareInheritedData.get()) { | 434 if (rareInheritedData.get() != other->rareInheritedData.get()) { |
| 435 if (rareInheritedData->highlight != other->rareInheritedData->highlight | 435 if (rareInheritedData->highlight != other->rareInheritedData->highlight |
| 436 || rareInheritedData->indent != other->rareInheritedData->indent | 436 || rareInheritedData->indent != other->rareInheritedData->indent |
| 437 #if ENABLE(CSS3_TEXT) | 437 #if ENABLE(CSS3_TEXT) |
| 438 || rareInheritedData->m_textAlignLast != other->rareInheritedData->m
_textAlignLast | |
| 439 || rareInheritedData->m_textIndentLine != other->rareInheritedData->
m_textIndentLine | 438 || rareInheritedData->m_textIndentLine != other->rareInheritedData->
m_textIndentLine |
| 440 #endif | 439 #endif |
| 441 || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m
_effectiveZoom | 440 || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m
_effectiveZoom |
| 442 || rareInheritedData->wordBreak != other->rareInheritedData->wordBre
ak | 441 || rareInheritedData->wordBreak != other->rareInheritedData->wordBre
ak |
| 443 || rareInheritedData->overflowWrap != other->rareInheritedData->over
flowWrap | 442 || rareInheritedData->overflowWrap != other->rareInheritedData->over
flowWrap |
| 444 || rareInheritedData->lineBreak != other->rareInheritedData->lineBre
ak | 443 || rareInheritedData->lineBreak != other->rareInheritedData->lineBre
ak |
| 445 || rareInheritedData->textSecurity != other->rareInheritedData->text
Security | 444 || rareInheritedData->textSecurity != other->rareInheritedData->text
Security |
| 446 || rareInheritedData->hyphens != other->rareInheritedData->hyphens | 445 || rareInheritedData->hyphens != other->rareInheritedData->hyphens |
| 447 || rareInheritedData->hyphenationLimitBefore != other->rareInherited
Data->hyphenationLimitBefore | 446 || rareInheritedData->hyphenationLimitBefore != other->rareInherited
Data->hyphenationLimitBefore |
| 448 || rareInheritedData->hyphenationLimitAfter != other->rareInheritedD
ata->hyphenationLimitAfter | 447 || rareInheritedData->hyphenationLimitAfter != other->rareInheritedD
ata->hyphenationLimitAfter |
| 449 || rareInheritedData->hyphenationString != other->rareInheritedData-
>hyphenationString | 448 || rareInheritedData->hyphenationString != other->rareInheritedData-
>hyphenationString |
| 450 || rareInheritedData->locale != other->rareInheritedData->locale | 449 || rareInheritedData->locale != other->rareInheritedData->locale |
| 451 || rareInheritedData->m_rubyPosition != other->rareInheritedData->m_
rubyPosition | 450 || rareInheritedData->m_rubyPosition != other->rareInheritedData->m_
rubyPosition |
| 452 || rareInheritedData->textEmphasisMark != other->rareInheritedData->
textEmphasisMark | 451 || rareInheritedData->textEmphasisMark != other->rareInheritedData->
textEmphasisMark |
| 453 || rareInheritedData->textEmphasisPosition != other->rareInheritedDa
ta->textEmphasisPosition | 452 || rareInheritedData->textEmphasisPosition != other->rareInheritedDa
ta->textEmphasisPosition |
| 454 || rareInheritedData->textEmphasisCustomMark != other->rareInherited
Data->textEmphasisCustomMark | 453 || rareInheritedData->textEmphasisCustomMark != other->rareInherited
Data->textEmphasisCustomMark |
| 454 || rareInheritedData->m_textAlignLast != other->rareInheritedData->m
_textAlignLast |
| 455 || rareInheritedData->m_textOrientation != other->rareInheritedData-
>m_textOrientation | 455 || rareInheritedData->m_textOrientation != other->rareInheritedData-
>m_textOrientation |
| 456 || rareInheritedData->m_tabSize != other->rareInheritedData->m_tabSi
ze | 456 || rareInheritedData->m_tabSize != other->rareInheritedData->m_tabSi
ze |
| 457 || rareInheritedData->m_lineBoxContain != other->rareInheritedData->
m_lineBoxContain | 457 || rareInheritedData->m_lineBoxContain != other->rareInheritedData->
m_lineBoxContain |
| 458 || rareInheritedData->m_lineGrid != other->rareInheritedData->m_line
Grid | 458 || rareInheritedData->m_lineGrid != other->rareInheritedData->m_line
Grid |
| 459 || rareInheritedData->m_lineSnap != other->rareInheritedData->m_line
Snap | 459 || rareInheritedData->m_lineSnap != other->rareInheritedData->m_line
Snap |
| 460 || rareInheritedData->m_lineAlign != other->rareInheritedData->m_lin
eAlign | 460 || rareInheritedData->m_lineAlign != other->rareInheritedData->m_lin
eAlign |
| 461 || rareInheritedData->listStyleImage != other->rareInheritedData->li
stStyleImage) | 461 || rareInheritedData->listStyleImage != other->rareInheritedData->li
stStyleImage) |
| 462 return StyleDifferenceLayout; | 462 return StyleDifferenceLayout; |
| 463 | 463 |
| 464 if (!rareInheritedData->shadowDataEquivalent(*other->rareInheritedData.g
et())) | 464 if (!rareInheritedData->shadowDataEquivalent(*other->rareInheritedData.g
et())) |
| (...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1573 info.addMember(rareInheritedData, "rareInheritedData"); | 1573 info.addMember(rareInheritedData, "rareInheritedData"); |
| 1574 // FIXME: inherited contains StyleImage and Font fields that might need to b
e instrumented. | 1574 // FIXME: inherited contains StyleImage and Font fields that might need to b
e instrumented. |
| 1575 info.addMember(inherited, "inherited"); | 1575 info.addMember(inherited, "inherited"); |
| 1576 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); | 1576 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); |
| 1577 info.addMember(m_svgStyle, "svgStyle"); | 1577 info.addMember(m_svgStyle, "svgStyle"); |
| 1578 info.addMember(inherited_flags, "inherited_flags"); | 1578 info.addMember(inherited_flags, "inherited_flags"); |
| 1579 info.addMember(noninherited_flags, "noninherited_flags"); | 1579 info.addMember(noninherited_flags, "noninherited_flags"); |
| 1580 } | 1580 } |
| 1581 | 1581 |
| 1582 } // namespace WebCore | 1582 } // namespace WebCore |
| OLD | NEW |