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

Side by Side Diff: Source/core/style/StyleRareInheritedData.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 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 , m_textJustify(ComputedStyle::initialTextJustify()) 82 , m_textJustify(ComputedStyle::initialTextJustify())
83 , m_textOrientation(TextOrientationVerticalRight) 83 , m_textOrientation(TextOrientationVerticalRight)
84 , m_textIndentLine(ComputedStyle::initialTextIndentLine()) 84 , m_textIndentLine(ComputedStyle::initialTextIndentLine())
85 , m_textIndentType(ComputedStyle::initialTextIndentLine()) 85 , m_textIndentType(ComputedStyle::initialTextIndentLine())
86 , m_lineBoxContain(ComputedStyle::initialLineBoxContain()) 86 , m_lineBoxContain(ComputedStyle::initialLineBoxContain())
87 , m_imageRendering(ComputedStyle::initialImageRendering()) 87 , m_imageRendering(ComputedStyle::initialImageRendering())
88 , m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition()) 88 , m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition())
89 , m_rubyPosition(ComputedStyle::initialRubyPosition()) 89 , m_rubyPosition(ComputedStyle::initialRubyPosition())
90 , m_subtreeWillChangeContents(false) 90 , m_subtreeWillChangeContents(false)
91 , m_selfOrAncestorHasDirAutoAttribute(false) 91 , m_selfOrAncestorHasDirAutoAttribute(false)
92 , m_respectImageOrientation(false)
92 , hyphenationLimitBefore(-1) 93 , hyphenationLimitBefore(-1)
93 , hyphenationLimitAfter(-1) 94 , hyphenationLimitAfter(-1)
94 , hyphenationLimitLines(-1) 95 , hyphenationLimitLines(-1)
95 , tapHighlightColor(ComputedStyle::initialTapHighlightColor()) 96 , tapHighlightColor(ComputedStyle::initialTapHighlightColor())
96 , m_tabSize(ComputedStyle::initialTabSize()) 97 , m_tabSize(ComputedStyle::initialTabSize())
97 { 98 {
98 } 99 }
99 100
100 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) 101 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
101 : RefCounted<StyleRareInheritedData>() 102 : RefCounted<StyleRareInheritedData>()
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 , m_textJustify(o.m_textJustify) 137 , m_textJustify(o.m_textJustify)
137 , m_textOrientation(o.m_textOrientation) 138 , m_textOrientation(o.m_textOrientation)
138 , m_textIndentLine(o.m_textIndentLine) 139 , m_textIndentLine(o.m_textIndentLine)
139 , m_textIndentType(o.m_textIndentType) 140 , m_textIndentType(o.m_textIndentType)
140 , m_lineBoxContain(o.m_lineBoxContain) 141 , m_lineBoxContain(o.m_lineBoxContain)
141 , m_imageRendering(o.m_imageRendering) 142 , m_imageRendering(o.m_imageRendering)
142 , m_textUnderlinePosition(o.m_textUnderlinePosition) 143 , m_textUnderlinePosition(o.m_textUnderlinePosition)
143 , m_rubyPosition(o.m_rubyPosition) 144 , m_rubyPosition(o.m_rubyPosition)
144 , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents) 145 , m_subtreeWillChangeContents(o.m_subtreeWillChangeContents)
145 , m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute) 146 , m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute)
147 , m_respectImageOrientation(o.m_respectImageOrientation)
146 , hyphenationString(o.hyphenationString) 148 , hyphenationString(o.hyphenationString)
147 , hyphenationLimitBefore(o.hyphenationLimitBefore) 149 , hyphenationLimitBefore(o.hyphenationLimitBefore)
148 , hyphenationLimitAfter(o.hyphenationLimitAfter) 150 , hyphenationLimitAfter(o.hyphenationLimitAfter)
149 , hyphenationLimitLines(o.hyphenationLimitLines) 151 , hyphenationLimitLines(o.hyphenationLimitLines)
150 , locale(o.locale) 152 , locale(o.locale)
151 , textEmphasisCustomMark(o.textEmphasisCustomMark) 153 , textEmphasisCustomMark(o.textEmphasisCustomMark)
152 , tapHighlightColor(o.tapHighlightColor) 154 , tapHighlightColor(o.tapHighlightColor)
153 , appliedTextDecorations(o.appliedTextDecorations) 155 , appliedTextDecorations(o.appliedTextDecorations)
154 , m_tabSize(o.m_tabSize) 156 , m_tabSize(o.m_tabSize)
155 { 157 {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 && textEmphasisMark == o.textEmphasisMark 200 && textEmphasisMark == o.textEmphasisMark
199 && textEmphasisPosition == o.textEmphasisPosition 201 && textEmphasisPosition == o.textEmphasisPosition
200 && m_textAlignLast == o.m_textAlignLast 202 && m_textAlignLast == o.m_textAlignLast
201 && m_textJustify == o.m_textJustify 203 && m_textJustify == o.m_textJustify
202 && m_textOrientation == o.m_textOrientation 204 && m_textOrientation == o.m_textOrientation
203 && m_textIndentLine == o.m_textIndentLine 205 && m_textIndentLine == o.m_textIndentLine
204 && m_textIndentType == o.m_textIndentType 206 && m_textIndentType == o.m_textIndentType
205 && m_lineBoxContain == o.m_lineBoxContain 207 && m_lineBoxContain == o.m_lineBoxContain
206 && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents 208 && m_subtreeWillChangeContents == o.m_subtreeWillChangeContents
207 && m_selfOrAncestorHasDirAutoAttribute == o.m_selfOrAncestorHasDirAutoAt tribute 209 && m_selfOrAncestorHasDirAutoAttribute == o.m_selfOrAncestorHasDirAutoAt tribute
210 && m_respectImageOrientation == o.m_respectImageOrientation
208 && hyphenationString == o.hyphenationString 211 && hyphenationString == o.hyphenationString
209 && locale == o.locale 212 && locale == o.locale
210 && textEmphasisCustomMark == o.textEmphasisCustomMark 213 && textEmphasisCustomMark == o.textEmphasisCustomMark
211 && quotesDataEquivalent(o) 214 && quotesDataEquivalent(o)
212 && m_tabSize == o.m_tabSize 215 && m_tabSize == o.m_tabSize
213 && m_imageRendering == o.m_imageRendering 216 && m_imageRendering == o.m_imageRendering
214 && m_textUnderlinePosition == o.m_textUnderlinePosition 217 && m_textUnderlinePosition == o.m_textUnderlinePosition
215 && m_rubyPosition == o.m_rubyPosition 218 && m_rubyPosition == o.m_rubyPosition
216 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) 219 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
217 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations); 220 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations);
218 } 221 }
219 222
220 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const 223 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const
221 { 224 {
222 return dataEquivalent(textShadow.get(), o.textShadow.get()); 225 return dataEquivalent(textShadow.get(), o.textShadow.get());
223 } 226 }
224 227
225 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 228 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
226 { 229 {
227 return dataEquivalent(quotes, o.quotes); 230 return dataEquivalent(quotes, o.quotes);
228 } 231 }
229 232
230 } // namespace blink 233 } // namespace blink
OLDNEW
« Source/core/layout/LayoutObject.cpp ('K') | « Source/core/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698