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

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, 6 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 428
429 if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData-> m_shapeInside) 429 if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData-> m_shapeInside)
430 return StyleDifferenceLayout; 430 return StyleDifferenceLayout;
431 } 431 }
432 432
433 if (rareInheritedData.get() != other->rareInheritedData.get()) { 433 if (rareInheritedData.get() != other->rareInheritedData.get()) {
434 if (rareInheritedData->highlight != other->rareInheritedData->highlight 434 if (rareInheritedData->highlight != other->rareInheritedData->highlight
435 || rareInheritedData->indent != other->rareInheritedData->indent 435 || rareInheritedData->indent != other->rareInheritedData->indent
436 #if ENABLE(CSS3_TEXT) 436 #if ENABLE(CSS3_TEXT)
437 || rareInheritedData->m_textAlignLast != other->rareInheritedData->m _textAlignLast 437 || rareInheritedData->m_textAlignLast != other->rareInheritedData->m _textAlignLast
438 || rareInheritedData->m_textJustify != other->rareInheritedData->m_t extJustify
438 || rareInheritedData->m_textIndentLine != other->rareInheritedData-> m_textIndentLine 439 || rareInheritedData->m_textIndentLine != other->rareInheritedData-> m_textIndentLine
439 #endif 440 #endif
440 || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m _effectiveZoom 441 || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m _effectiveZoom
441 || rareInheritedData->wordBreak != other->rareInheritedData->wordBre ak 442 || rareInheritedData->wordBreak != other->rareInheritedData->wordBre ak
442 || rareInheritedData->overflowWrap != other->rareInheritedData->over flowWrap 443 || rareInheritedData->overflowWrap != other->rareInheritedData->over flowWrap
443 || rareInheritedData->nbspMode != other->rareInheritedData->nbspMode 444 || rareInheritedData->nbspMode != other->rareInheritedData->nbspMode
444 || rareInheritedData->lineBreak != other->rareInheritedData->lineBre ak 445 || rareInheritedData->lineBreak != other->rareInheritedData->lineBre ak
445 || rareInheritedData->textSecurity != other->rareInheritedData->text Security 446 || rareInheritedData->textSecurity != other->rareInheritedData->text Security
446 || rareInheritedData->hyphens != other->rareInheritedData->hyphens 447 || rareInheritedData->hyphens != other->rareInheritedData->hyphens
447 || rareInheritedData->hyphenationLimitBefore != other->rareInherited Data->hyphenationLimitBefore 448 || rareInheritedData->hyphenationLimitBefore != other->rareInherited Data->hyphenationLimitBefore
(...skipping 1125 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