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

Side by Side Diff: Source/core/style/ComputedStyle.cpp

Issue 1162793003: Add CSS image-orientation: from-image (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address even more review comments Created 5 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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 || rareInheritedData->m_textIndentLine != other.rareInheritedData->m _textIndentLine 519 || rareInheritedData->m_textIndentLine != other.rareInheritedData->m _textIndentLine
520 || rareInheritedData->m_effectiveZoom != other.rareInheritedData->m_ effectiveZoom 520 || rareInheritedData->m_effectiveZoom != other.rareInheritedData->m_ effectiveZoom
521 || rareInheritedData->wordBreak != other.rareInheritedData->wordBrea k 521 || rareInheritedData->wordBreak != other.rareInheritedData->wordBrea k
522 || rareInheritedData->overflowWrap != other.rareInheritedData->overf lowWrap 522 || rareInheritedData->overflowWrap != other.rareInheritedData->overf lowWrap
523 || rareInheritedData->lineBreak != other.rareInheritedData->lineBrea k 523 || rareInheritedData->lineBreak != other.rareInheritedData->lineBrea k
524 || rareInheritedData->textSecurity != other.rareInheritedData->textS ecurity 524 || rareInheritedData->textSecurity != other.rareInheritedData->textS ecurity
525 || rareInheritedData->hyphens != other.rareInheritedData->hyphens 525 || rareInheritedData->hyphens != other.rareInheritedData->hyphens
526 || rareInheritedData->hyphenationLimitBefore != other.rareInheritedD ata->hyphenationLimitBefore 526 || rareInheritedData->hyphenationLimitBefore != other.rareInheritedD ata->hyphenationLimitBefore
527 || rareInheritedData->hyphenationLimitAfter != other.rareInheritedDa ta->hyphenationLimitAfter 527 || rareInheritedData->hyphenationLimitAfter != other.rareInheritedDa ta->hyphenationLimitAfter
528 || rareInheritedData->hyphenationString != other.rareInheritedData-> hyphenationString 528 || rareInheritedData->hyphenationString != other.rareInheritedData-> hyphenationString
529 || rareInheritedData->m_respectImageOrientation != other.rareInherit edData->m_respectImageOrientation
529 || rareInheritedData->locale != other.rareInheritedData->locale 530 || rareInheritedData->locale != other.rareInheritedData->locale
530 || rareInheritedData->m_rubyPosition != other.rareInheritedData->m_r ubyPosition 531 || rareInheritedData->m_rubyPosition != other.rareInheritedData->m_r ubyPosition
531 || rareInheritedData->textEmphasisMark != other.rareInheritedData->t extEmphasisMark 532 || rareInheritedData->textEmphasisMark != other.rareInheritedData->t extEmphasisMark
532 || rareInheritedData->textEmphasisPosition != other.rareInheritedDat a->textEmphasisPosition 533 || rareInheritedData->textEmphasisPosition != other.rareInheritedDat a->textEmphasisPosition
533 || rareInheritedData->textEmphasisCustomMark != other.rareInheritedD ata->textEmphasisCustomMark 534 || rareInheritedData->textEmphasisCustomMark != other.rareInheritedD ata->textEmphasisCustomMark
534 || rareInheritedData->m_textJustify != other.rareInheritedData->m_te xtJustify 535 || rareInheritedData->m_textJustify != other.rareInheritedData->m_te xtJustify
535 || rareInheritedData->m_textOrientation != other.rareInheritedData-> m_textOrientation 536 || rareInheritedData->m_textOrientation != other.rareInheritedData-> m_textOrientation
536 || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSiz e 537 || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSiz e
537 || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m _lineBoxContain 538 || rareInheritedData->m_lineBoxContain != other.rareInheritedData->m _lineBoxContain
538 || rareInheritedData->listStyleImage != other.rareInheritedData->lis tStyleImage 539 || rareInheritedData->listStyleImage != other.rareInheritedData->lis tStyleImage
(...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after
1744 } 1745 }
1745 1746
1746 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) 1747 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other)
1747 { 1748 {
1748 setEmptyState(other.emptyState()); 1749 setEmptyState(other.emptyState());
1749 if (other.hasExplicitlyInheritedProperties()) 1750 if (other.hasExplicitlyInheritedProperties())
1750 setHasExplicitlyInheritedProperties(); 1751 setHasExplicitlyInheritedProperties();
1751 } 1752 }
1752 1753
1753 } // namespace blink 1754 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698