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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 , m_textOrientation(TextOrientationVerticalRight) | 80 , m_textOrientation(TextOrientationVerticalRight) |
81 #if ENABLE(CSS3_TEXT) | 81 #if ENABLE(CSS3_TEXT) |
82 , m_textIndentLine(RenderStyle::initialTextIndentLine()) | 82 , m_textIndentLine(RenderStyle::initialTextIndentLine()) |
83 #endif | 83 #endif |
84 , m_lineBoxContain(RenderStyle::initialLineBoxContain()) | 84 , m_lineBoxContain(RenderStyle::initialLineBoxContain()) |
85 , m_imageRendering(RenderStyle::initialImageRendering()) | 85 , m_imageRendering(RenderStyle::initialImageRendering()) |
86 , m_lineSnap(RenderStyle::initialLineSnap()) | 86 , m_lineSnap(RenderStyle::initialLineSnap()) |
87 , m_lineAlign(RenderStyle::initialLineAlign()) | 87 , m_lineAlign(RenderStyle::initialLineAlign()) |
88 #if ENABLE(CSS3_TEXT) | 88 #if ENABLE(CSS3_TEXT) |
89 , m_textAlignLast(RenderStyle::initialTextAlignLast()) | 89 , m_textAlignLast(RenderStyle::initialTextAlignLast()) |
| 90 , m_textJustify(RenderStyle::initialTextJustify()) |
90 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) | 91 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) |
91 #endif // CSS3_TEXT | 92 #endif // CSS3_TEXT |
92 , m_rubyPosition(RenderStyle::initialRubyPosition()) | 93 , m_rubyPosition(RenderStyle::initialRubyPosition()) |
93 , hyphenationLimitBefore(-1) | 94 , hyphenationLimitBefore(-1) |
94 , hyphenationLimitAfter(-1) | 95 , hyphenationLimitAfter(-1) |
95 , hyphenationLimitLines(-1) | 96 , hyphenationLimitLines(-1) |
96 , m_lineGrid(RenderStyle::initialLineGrid()) | 97 , m_lineGrid(RenderStyle::initialLineGrid()) |
97 , m_tabSize(RenderStyle::initialTabSize()) | 98 , m_tabSize(RenderStyle::initialTabSize()) |
98 , tapHighlightColor(RenderStyle::initialTapHighlightColor()) | 99 , tapHighlightColor(RenderStyle::initialTapHighlightColor()) |
99 { | 100 { |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 , m_textOrientation(o.m_textOrientation) | 136 , m_textOrientation(o.m_textOrientation) |
136 #if ENABLE(CSS3_TEXT) | 137 #if ENABLE(CSS3_TEXT) |
137 , m_textIndentLine(o.m_textIndentLine) | 138 , m_textIndentLine(o.m_textIndentLine) |
138 #endif | 139 #endif |
139 , m_lineBoxContain(o.m_lineBoxContain) | 140 , m_lineBoxContain(o.m_lineBoxContain) |
140 , m_imageRendering(o.m_imageRendering) | 141 , m_imageRendering(o.m_imageRendering) |
141 , m_lineSnap(o.m_lineSnap) | 142 , m_lineSnap(o.m_lineSnap) |
142 , m_lineAlign(o.m_lineAlign) | 143 , m_lineAlign(o.m_lineAlign) |
143 #if ENABLE(CSS3_TEXT) | 144 #if ENABLE(CSS3_TEXT) |
144 , m_textAlignLast(o.m_textAlignLast) | 145 , m_textAlignLast(o.m_textAlignLast) |
| 146 , m_textJustify(o.m_textJustify) |
145 , m_textUnderlinePosition(o.m_textUnderlinePosition) | 147 , m_textUnderlinePosition(o.m_textUnderlinePosition) |
146 #endif // CSS3_TEXT | 148 #endif // CSS3_TEXT |
147 , m_rubyPosition(o.m_rubyPosition) | 149 , m_rubyPosition(o.m_rubyPosition) |
148 , hyphenationString(o.hyphenationString) | 150 , hyphenationString(o.hyphenationString) |
149 , hyphenationLimitBefore(o.hyphenationLimitBefore) | 151 , hyphenationLimitBefore(o.hyphenationLimitBefore) |
150 , hyphenationLimitAfter(o.hyphenationLimitAfter) | 152 , hyphenationLimitAfter(o.hyphenationLimitAfter) |
151 , hyphenationLimitLines(o.hyphenationLimitLines) | 153 , hyphenationLimitLines(o.hyphenationLimitLines) |
152 , locale(o.locale) | 154 , locale(o.locale) |
153 , textEmphasisCustomMark(o.textEmphasisCustomMark) | 155 , textEmphasisCustomMark(o.textEmphasisCustomMark) |
154 , m_lineGrid(o.m_lineGrid) | 156 , m_lineGrid(o.m_lineGrid) |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 && m_lineBoxContain == o.m_lineBoxContain | 215 && m_lineBoxContain == o.m_lineBoxContain |
214 && hyphenationString == o.hyphenationString | 216 && hyphenationString == o.hyphenationString |
215 && locale == o.locale | 217 && locale == o.locale |
216 && textEmphasisCustomMark == o.textEmphasisCustomMark | 218 && textEmphasisCustomMark == o.textEmphasisCustomMark |
217 && QuotesData::equals(quotes.get(), o.quotes.get()) | 219 && QuotesData::equals(quotes.get(), o.quotes.get()) |
218 && m_tabSize == o.m_tabSize | 220 && m_tabSize == o.m_tabSize |
219 && m_lineGrid == o.m_lineGrid | 221 && m_lineGrid == o.m_lineGrid |
220 && m_imageRendering == o.m_imageRendering | 222 && m_imageRendering == o.m_imageRendering |
221 #if ENABLE(CSS3_TEXT) | 223 #if ENABLE(CSS3_TEXT) |
222 && m_textAlignLast == o.m_textAlignLast | 224 && m_textAlignLast == o.m_textAlignLast |
| 225 && m_textJustify == o.m_textJustify |
223 && m_textUnderlinePosition == o.m_textUnderlinePosition | 226 && m_textUnderlinePosition == o.m_textUnderlinePosition |
224 #endif // CSS3_TEXT | 227 #endif // CSS3_TEXT |
225 && m_rubyPosition == o.m_rubyPosition | 228 && m_rubyPosition == o.m_rubyPosition |
226 && m_lineSnap == o.m_lineSnap | 229 && m_lineSnap == o.m_lineSnap |
227 && m_variables == o.m_variables | 230 && m_variables == o.m_variables |
228 && m_lineAlign == o.m_lineAlign | 231 && m_lineAlign == o.m_lineAlign |
229 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g
et()); | 232 && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.g
et()); |
230 } | 233 } |
231 | 234 |
232 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData&
o) const | 235 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData&
o) const |
(...skipping 15 matching lines...) Expand all Loading... |
248 info.addMember(cursorData, "cursorData"); | 251 info.addMember(cursorData, "cursorData"); |
249 info.addMember(hyphenationString, "hyphenationString"); | 252 info.addMember(hyphenationString, "hyphenationString"); |
250 info.addMember(locale, "locale"); | 253 info.addMember(locale, "locale"); |
251 info.addMember(textEmphasisCustomMark, "textEmphasisCustomMark"); | 254 info.addMember(textEmphasisCustomMark, "textEmphasisCustomMark"); |
252 info.addMember(quotes, "quotes"); | 255 info.addMember(quotes, "quotes"); |
253 info.addMember(m_lineGrid, "lineGrid"); | 256 info.addMember(m_lineGrid, "lineGrid"); |
254 info.addMember(m_variables, "variables"); | 257 info.addMember(m_variables, "variables"); |
255 } | 258 } |
256 | 259 |
257 } // namespace WebCore | 260 } // namespace WebCore |
OLD | NEW |