Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 17155007: [CSS3] Parsing the property, text-justify. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@parsingTextJustify
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 || rareInheritedData->hyphens != other->rareInheritedData->hyphens 445 || rareInheritedData->hyphens != other->rareInheritedData->hyphens
446 || rareInheritedData->hyphenationLimitBefore != other->rareInherited Data->hyphenationLimitBefore 446 || rareInheritedData->hyphenationLimitBefore != other->rareInherited Data->hyphenationLimitBefore
447 || rareInheritedData->hyphenationLimitAfter != other->rareInheritedD ata->hyphenationLimitAfter 447 || rareInheritedData->hyphenationLimitAfter != other->rareInheritedD ata->hyphenationLimitAfter
448 || rareInheritedData->hyphenationString != other->rareInheritedData- >hyphenationString 448 || rareInheritedData->hyphenationString != other->rareInheritedData- >hyphenationString
449 || rareInheritedData->locale != other->rareInheritedData->locale 449 || rareInheritedData->locale != other->rareInheritedData->locale
450 || rareInheritedData->m_rubyPosition != other->rareInheritedData->m_ rubyPosition 450 || rareInheritedData->m_rubyPosition != other->rareInheritedData->m_ rubyPosition
451 || rareInheritedData->textEmphasisMark != other->rareInheritedData-> textEmphasisMark 451 || rareInheritedData->textEmphasisMark != other->rareInheritedData-> textEmphasisMark
452 || rareInheritedData->textEmphasisPosition != other->rareInheritedDa ta->textEmphasisPosition 452 || rareInheritedData->textEmphasisPosition != other->rareInheritedDa ta->textEmphasisPosition
453 || rareInheritedData->textEmphasisCustomMark != other->rareInherited Data->textEmphasisCustomMark 453 || rareInheritedData->textEmphasisCustomMark != other->rareInherited Data->textEmphasisCustomMark
454 || rareInheritedData->m_textAlignLast != other->rareInheritedData->m _textAlignLast 454 || rareInheritedData->m_textAlignLast != other->rareInheritedData->m _textAlignLast
455 || rareInheritedData->m_textJustify != other->rareInheritedData->m_t extJustify
455 || rareInheritedData->m_textOrientation != other->rareInheritedData- >m_textOrientation 456 || rareInheritedData->m_textOrientation != other->rareInheritedData- >m_textOrientation
456 || rareInheritedData->m_tabSize != other->rareInheritedData->m_tabSi ze 457 || rareInheritedData->m_tabSize != other->rareInheritedData->m_tabSi ze
457 || rareInheritedData->m_lineBoxContain != other->rareInheritedData-> m_lineBoxContain 458 || rareInheritedData->m_lineBoxContain != other->rareInheritedData-> m_lineBoxContain
458 || rareInheritedData->m_lineGrid != other->rareInheritedData->m_line Grid 459 || rareInheritedData->m_lineGrid != other->rareInheritedData->m_line Grid
459 || rareInheritedData->m_lineSnap != other->rareInheritedData->m_line Snap 460 || rareInheritedData->m_lineSnap != other->rareInheritedData->m_line Snap
460 || rareInheritedData->m_lineAlign != other->rareInheritedData->m_lin eAlign 461 || rareInheritedData->m_lineAlign != other->rareInheritedData->m_lin eAlign
461 || rareInheritedData->listStyleImage != other->rareInheritedData->li stStyleImage) 462 || rareInheritedData->listStyleImage != other->rareInheritedData->li stStyleImage)
462 return StyleDifferenceLayout; 463 return StyleDifferenceLayout;
463 464
464 if (!rareInheritedData->shadowDataEquivalent(*other->rareInheritedData.g et())) 465 if (!rareInheritedData->shadowDataEquivalent(*other->rareInheritedData.g et()))
(...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 info.addMember(rareInheritedData, "rareInheritedData"); 1574 info.addMember(rareInheritedData, "rareInheritedData");
1574 // FIXME: inherited contains StyleImage and Font fields that might need to b e instrumented. 1575 // FIXME: inherited contains StyleImage and Font fields that might need to b e instrumented.
1575 info.addMember(inherited, "inherited"); 1576 info.addMember(inherited, "inherited");
1576 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); 1577 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles");
1577 info.addMember(m_svgStyle, "svgStyle"); 1578 info.addMember(m_svgStyle, "svgStyle");
1578 info.addMember(inherited_flags, "inherited_flags"); 1579 info.addMember(inherited_flags, "inherited_flags");
1579 info.addMember(noninherited_flags, "noninherited_flags"); 1580 info.addMember(noninherited_flags, "noninherited_flags");
1580 } 1581 }
1581 1582
1582 } // namespace WebCore 1583 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698