| 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 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 || rareInheritedData->m_textIndentLine != other.rareInheritedData->m
_textIndentLine | 521 || rareInheritedData->m_textIndentLine != other.rareInheritedData->m
_textIndentLine |
| 522 || rareInheritedData->m_effectiveZoom != other.rareInheritedData->m_
effectiveZoom | 522 || rareInheritedData->m_effectiveZoom != other.rareInheritedData->m_
effectiveZoom |
| 523 || rareInheritedData->wordBreak != other.rareInheritedData->wordBrea
k | 523 || rareInheritedData->wordBreak != other.rareInheritedData->wordBrea
k |
| 524 || rareInheritedData->overflowWrap != other.rareInheritedData->overf
lowWrap | 524 || rareInheritedData->overflowWrap != other.rareInheritedData->overf
lowWrap |
| 525 || rareInheritedData->lineBreak != other.rareInheritedData->lineBrea
k | 525 || rareInheritedData->lineBreak != other.rareInheritedData->lineBrea
k |
| 526 || rareInheritedData->textSecurity != other.rareInheritedData->textS
ecurity | 526 || rareInheritedData->textSecurity != other.rareInheritedData->textS
ecurity |
| 527 || rareInheritedData->hyphens != other.rareInheritedData->hyphens | 527 || rareInheritedData->hyphens != other.rareInheritedData->hyphens |
| 528 || rareInheritedData->hyphenationLimitBefore != other.rareInheritedD
ata->hyphenationLimitBefore | 528 || rareInheritedData->hyphenationLimitBefore != other.rareInheritedD
ata->hyphenationLimitBefore |
| 529 || rareInheritedData->hyphenationLimitAfter != other.rareInheritedDa
ta->hyphenationLimitAfter | 529 || rareInheritedData->hyphenationLimitAfter != other.rareInheritedDa
ta->hyphenationLimitAfter |
| 530 || rareInheritedData->hyphenationString != other.rareInheritedData->
hyphenationString | 530 || rareInheritedData->hyphenationString != other.rareInheritedData->
hyphenationString |
| 531 || rareInheritedData->m_respectImageOrientation != other.rareInherit
edData->m_respectImageOrientation |
| 531 || rareInheritedData->locale != other.rareInheritedData->locale | 532 || rareInheritedData->locale != other.rareInheritedData->locale |
| 532 || rareInheritedData->m_rubyPosition != other.rareInheritedData->m_r
ubyPosition | 533 || rareInheritedData->m_rubyPosition != other.rareInheritedData->m_r
ubyPosition |
| 533 || rareInheritedData->textEmphasisMark != other.rareInheritedData->t
extEmphasisMark | 534 || rareInheritedData->textEmphasisMark != other.rareInheritedData->t
extEmphasisMark |
| 534 || rareInheritedData->textEmphasisPosition != other.rareInheritedDat
a->textEmphasisPosition | 535 || rareInheritedData->textEmphasisPosition != other.rareInheritedDat
a->textEmphasisPosition |
| 535 || rareInheritedData->textEmphasisCustomMark != other.rareInheritedD
ata->textEmphasisCustomMark | 536 || rareInheritedData->textEmphasisCustomMark != other.rareInheritedD
ata->textEmphasisCustomMark |
| 536 || rareInheritedData->m_textJustify != other.rareInheritedData->m_te
xtJustify | 537 || rareInheritedData->m_textJustify != other.rareInheritedData->m_te
xtJustify |
| 537 || rareInheritedData->m_textOrientation != other.rareInheritedData->
m_textOrientation | 538 || rareInheritedData->m_textOrientation != other.rareInheritedData->
m_textOrientation |
| 538 || rareInheritedData->m_textCombine != other.rareInheritedData->m_te
xtCombine | 539 || rareInheritedData->m_textCombine != other.rareInheritedData->m_te
xtCombine |
| 539 || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSiz
e | 540 || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSiz
e |
| 540 || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m
_lineBoxContain | 541 || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m
_lineBoxContain |
| (...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1768 } | 1769 } |
| 1769 | 1770 |
| 1770 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) | 1771 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) |
| 1771 { | 1772 { |
| 1772 setEmptyState(other.emptyState()); | 1773 setEmptyState(other.emptyState()); |
| 1773 if (other.hasExplicitlyInheritedProperties()) | 1774 if (other.hasExplicitlyInheritedProperties()) |
| 1774 setHasExplicitlyInheritedProperties(); | 1775 setHasExplicitlyInheritedProperties(); |
| 1775 } | 1776 } |
| 1776 | 1777 |
| 1777 } // namespace blink | 1778 } // namespace blink |
| OLD | NEW |