| 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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 489 || rareInheritedData->hyphens != other->rareInheritedData->hyphens | 489 || rareInheritedData->hyphens != other->rareInheritedData->hyphens |
| 490 || rareInheritedData->hyphenationLimitBefore != other->rareInherited
Data->hyphenationLimitBefore | 490 || rareInheritedData->hyphenationLimitBefore != other->rareInherited
Data->hyphenationLimitBefore |
| 491 || rareInheritedData->hyphenationLimitAfter != other->rareInheritedD
ata->hyphenationLimitAfter | 491 || rareInheritedData->hyphenationLimitAfter != other->rareInheritedD
ata->hyphenationLimitAfter |
| 492 || rareInheritedData->hyphenationString != other->rareInheritedData-
>hyphenationString | 492 || rareInheritedData->hyphenationString != other->rareInheritedData-
>hyphenationString |
| 493 || rareInheritedData->locale != other->rareInheritedData->locale | 493 || rareInheritedData->locale != other->rareInheritedData->locale |
| 494 || rareInheritedData->m_rubyPosition != other->rareInheritedData->m_
rubyPosition | 494 || rareInheritedData->m_rubyPosition != other->rareInheritedData->m_
rubyPosition |
| 495 || rareInheritedData->textEmphasisMark != other->rareInheritedData->
textEmphasisMark | 495 || rareInheritedData->textEmphasisMark != other->rareInheritedData->
textEmphasisMark |
| 496 || rareInheritedData->textEmphasisPosition != other->rareInheritedDa
ta->textEmphasisPosition | 496 || rareInheritedData->textEmphasisPosition != other->rareInheritedDa
ta->textEmphasisPosition |
| 497 || rareInheritedData->textEmphasisCustomMark != other->rareInherited
Data->textEmphasisCustomMark | 497 || rareInheritedData->textEmphasisCustomMark != other->rareInherited
Data->textEmphasisCustomMark |
| 498 || rareInheritedData->m_textAlignLast != other->rareInheritedData->m
_textAlignLast | 498 || rareInheritedData->m_textAlignLast != other->rareInheritedData->m
_textAlignLast |
| 499 || rareInheritedData->m_textJustify != other->rareInheritedData->m_t
extJustify |
| 499 || rareInheritedData->m_textOrientation != other->rareInheritedData-
>m_textOrientation | 500 || rareInheritedData->m_textOrientation != other->rareInheritedData-
>m_textOrientation |
| 500 || rareInheritedData->m_tabSize != other->rareInheritedData->m_tabSi
ze | 501 || rareInheritedData->m_tabSize != other->rareInheritedData->m_tabSi
ze |
| 501 || rareInheritedData->m_lineBoxContain != other->rareInheritedData->
m_lineBoxContain | 502 || rareInheritedData->m_lineBoxContain != other->rareInheritedData->
m_lineBoxContain |
| 502 || rareInheritedData->m_lineGrid != other->rareInheritedData->m_line
Grid | 503 || rareInheritedData->m_lineGrid != other->rareInheritedData->m_line
Grid |
| 503 || rareInheritedData->m_lineSnap != other->rareInheritedData->m_line
Snap | 504 || rareInheritedData->m_lineSnap != other->rareInheritedData->m_line
Snap |
| 504 || rareInheritedData->m_lineAlign != other->rareInheritedData->m_lin
eAlign | 505 || rareInheritedData->m_lineAlign != other->rareInheritedData->m_lin
eAlign |
| 505 || rareInheritedData->listStyleImage != other->rareInheritedData->li
stStyleImage) | 506 || rareInheritedData->listStyleImage != other->rareInheritedData->li
stStyleImage) |
| 506 return StyleDifferenceLayout; | 507 return StyleDifferenceLayout; |
| 507 | 508 |
| 508 if (!rareInheritedData->shadowDataEquivalent(*other->rareInheritedData.g
et())) | 509 if (!rareInheritedData->shadowDataEquivalent(*other->rareInheritedData.g
et())) |
| (...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1631 surround.access()->border.m_image.setOutset(outset); | 1632 surround.access()->border.m_image.setOutset(outset); |
| 1632 } | 1633 } |
| 1633 | 1634 |
| 1634 ShapeValue* RenderStyle::initialShapeInside() | 1635 ShapeValue* RenderStyle::initialShapeInside() |
| 1635 { | 1636 { |
| 1636 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu
tsideValue())); | 1637 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu
tsideValue())); |
| 1637 return sOutsideValue.get(); | 1638 return sOutsideValue.get(); |
| 1638 } | 1639 } |
| 1639 | 1640 |
| 1640 } // namespace WebCore | 1641 } // namespace WebCore |
| OLD | NEW |