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 * | 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 , lineBreak(LineBreakAuto) | 69 , lineBreak(LineBreakAuto) |
70 , resize(RenderStyle::initialResize()) | 70 , resize(RenderStyle::initialResize()) |
71 , userSelect(RenderStyle::initialUserSelect()) | 71 , userSelect(RenderStyle::initialUserSelect()) |
72 , speak(SpeakNormal) | 72 , speak(SpeakNormal) |
73 , hyphens(HyphensManual) | 73 , hyphens(HyphensManual) |
74 , textEmphasisFill(TextEmphasisFillFilled) | 74 , textEmphasisFill(TextEmphasisFillFilled) |
75 , textEmphasisMark(TextEmphasisMarkNone) | 75 , textEmphasisMark(TextEmphasisMarkNone) |
76 , textEmphasisPosition(TextEmphasisPositionOver) | 76 , textEmphasisPosition(TextEmphasisPositionOver) |
77 , m_textAlignLast(RenderStyle::initialTextAlignLast()) | 77 , m_textAlignLast(RenderStyle::initialTextAlignLast()) |
78 , m_textOrientation(TextOrientationVerticalRight) | 78 , m_textOrientation(TextOrientationVerticalRight) |
79 #if ENABLE(CSS3_TEXT) | |
80 , m_textIndentLine(RenderStyle::initialTextIndentLine()) | 79 , m_textIndentLine(RenderStyle::initialTextIndentLine()) |
81 #endif | |
82 , m_lineBoxContain(RenderStyle::initialLineBoxContain()) | 80 , m_lineBoxContain(RenderStyle::initialLineBoxContain()) |
83 , m_imageRendering(RenderStyle::initialImageRendering()) | 81 , m_imageRendering(RenderStyle::initialImageRendering()) |
84 , m_lineSnap(RenderStyle::initialLineSnap()) | 82 , m_lineSnap(RenderStyle::initialLineSnap()) |
85 , m_lineAlign(RenderStyle::initialLineAlign()) | 83 , m_lineAlign(RenderStyle::initialLineAlign()) |
86 #if ENABLE(CSS3_TEXT) | 84 #if ENABLE(CSS3_TEXT) |
87 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) | 85 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) |
88 #endif // CSS3_TEXT | 86 #endif // CSS3_TEXT |
89 , m_rubyPosition(RenderStyle::initialRubyPosition()) | 87 , m_rubyPosition(RenderStyle::initialRubyPosition()) |
90 , hyphenationLimitBefore(-1) | 88 , hyphenationLimitBefore(-1) |
91 , hyphenationLimitAfter(-1) | 89 , hyphenationLimitAfter(-1) |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 , lineBreak(o.lineBreak) | 121 , lineBreak(o.lineBreak) |
124 , resize(o.resize) | 122 , resize(o.resize) |
125 , userSelect(o.userSelect) | 123 , userSelect(o.userSelect) |
126 , speak(o.speak) | 124 , speak(o.speak) |
127 , hyphens(o.hyphens) | 125 , hyphens(o.hyphens) |
128 , textEmphasisFill(o.textEmphasisFill) | 126 , textEmphasisFill(o.textEmphasisFill) |
129 , textEmphasisMark(o.textEmphasisMark) | 127 , textEmphasisMark(o.textEmphasisMark) |
130 , textEmphasisPosition(o.textEmphasisPosition) | 128 , textEmphasisPosition(o.textEmphasisPosition) |
131 , m_textAlignLast(o.m_textAlignLast) | 129 , m_textAlignLast(o.m_textAlignLast) |
132 , m_textOrientation(o.m_textOrientation) | 130 , m_textOrientation(o.m_textOrientation) |
133 #if ENABLE(CSS3_TEXT) | |
134 , m_textIndentLine(o.m_textIndentLine) | 131 , m_textIndentLine(o.m_textIndentLine) |
135 #endif | |
136 , m_lineBoxContain(o.m_lineBoxContain) | 132 , m_lineBoxContain(o.m_lineBoxContain) |
137 , m_imageRendering(o.m_imageRendering) | 133 , m_imageRendering(o.m_imageRendering) |
138 , m_lineSnap(o.m_lineSnap) | 134 , m_lineSnap(o.m_lineSnap) |
139 , m_lineAlign(o.m_lineAlign) | 135 , m_lineAlign(o.m_lineAlign) |
140 #if ENABLE(CSS3_TEXT) | 136 #if ENABLE(CSS3_TEXT) |
141 , m_textUnderlinePosition(o.m_textUnderlinePosition) | 137 , m_textUnderlinePosition(o.m_textUnderlinePosition) |
142 #endif // CSS3_TEXT | 138 #endif // CSS3_TEXT |
143 , m_rubyPosition(o.m_rubyPosition) | 139 , m_rubyPosition(o.m_rubyPosition) |
144 , hyphenationString(o.hyphenationString) | 140 , hyphenationString(o.hyphenationString) |
145 , hyphenationLimitBefore(o.hyphenationLimitBefore) | 141 , hyphenationLimitBefore(o.hyphenationLimitBefore) |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 && speak == o.speak | 192 && speak == o.speak |
197 && hyphens == o.hyphens | 193 && hyphens == o.hyphens |
198 && hyphenationLimitBefore == o.hyphenationLimitBefore | 194 && hyphenationLimitBefore == o.hyphenationLimitBefore |
199 && hyphenationLimitAfter == o.hyphenationLimitAfter | 195 && hyphenationLimitAfter == o.hyphenationLimitAfter |
200 && hyphenationLimitLines == o.hyphenationLimitLines | 196 && hyphenationLimitLines == o.hyphenationLimitLines |
201 && textEmphasisFill == o.textEmphasisFill | 197 && textEmphasisFill == o.textEmphasisFill |
202 && textEmphasisMark == o.textEmphasisMark | 198 && textEmphasisMark == o.textEmphasisMark |
203 && textEmphasisPosition == o.textEmphasisPosition | 199 && textEmphasisPosition == o.textEmphasisPosition |
204 && m_textAlignLast == o.m_textAlignLast | 200 && m_textAlignLast == o.m_textAlignLast |
205 && m_textOrientation == o.m_textOrientation | 201 && m_textOrientation == o.m_textOrientation |
206 #if ENABLE(CSS3_TEXT) | |
207 && m_textIndentLine == o.m_textIndentLine | 202 && m_textIndentLine == o.m_textIndentLine |
208 #endif | |
209 && m_lineBoxContain == o.m_lineBoxContain | 203 && m_lineBoxContain == o.m_lineBoxContain |
210 && hyphenationString == o.hyphenationString | 204 && hyphenationString == o.hyphenationString |
211 && locale == o.locale | 205 && locale == o.locale |
212 && textEmphasisCustomMark == o.textEmphasisCustomMark | 206 && textEmphasisCustomMark == o.textEmphasisCustomMark |
213 && QuotesData::equals(quotes.get(), o.quotes.get()) | 207 && QuotesData::equals(quotes.get(), o.quotes.get()) |
214 && m_tabSize == o.m_tabSize | 208 && m_tabSize == o.m_tabSize |
215 && m_lineGrid == o.m_lineGrid | 209 && m_lineGrid == o.m_lineGrid |
216 && m_imageRendering == o.m_imageRendering | 210 && m_imageRendering == o.m_imageRendering |
217 #if ENABLE(CSS3_TEXT) | 211 #if ENABLE(CSS3_TEXT) |
218 && m_textUnderlinePosition == o.m_textUnderlinePosition | 212 && m_textUnderlinePosition == o.m_textUnderlinePosition |
219 #endif // CSS3_TEXT | 213 #endif // CSS3_TEXT |
220 && m_rubyPosition == o.m_rubyPosition | 214 && m_rubyPosition == o.m_rubyPosition |
221 && m_lineSnap == o.m_lineSnap | 215 && m_lineSnap == o.m_lineSnap |
222 && m_variables == o.m_variables | 216 && m_variables == o.m_variables |
223 && m_lineAlign == o.m_lineAlign | 217 && m_lineAlign == o.m_lineAlign |
224 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g
et()); | 218 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g
et()); |
225 } | 219 } |
226 | 220 |
227 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData&
o) const | 221 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData&
o) const |
228 { | 222 { |
229 if ((!textShadow && o.textShadow) || (textShadow && !o.textShadow)) | 223 if ((!textShadow && o.textShadow) || (textShadow && !o.textShadow)) |
230 return false; | 224 return false; |
231 if (textShadow && o.textShadow && (*textShadow != *o.textShadow)) | 225 if (textShadow && o.textShadow && (*textShadow != *o.textShadow)) |
232 return false; | 226 return false; |
233 return true; | 227 return true; |
234 } | 228 } |
235 | 229 |
236 } // namespace WebCore | 230 } // namespace WebCore |
OLD | NEW |