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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 AtomicString atomicStrings[4]; | 42 AtomicString atomicStrings[4]; |
43 void* refPtrs[3]; | 43 void* refPtrs[3]; |
44 Length lengths[1]; | 44 Length lengths[1]; |
45 float secondFloat; | 45 float secondFloat; |
46 unsigned m_bitfields[2]; | 46 unsigned m_bitfields[2]; |
47 short pagedMediaShorts[2]; | 47 short pagedMediaShorts[2]; |
48 short hyphenationShorts[3]; | 48 short hyphenationShorts[3]; |
49 | 49 |
50 Color touchColors; | 50 Color touchColors; |
51 TabSize tabSize; | 51 TabSize tabSize; |
| 52 void* variables[1]; |
52 }; | 53 }; |
53 | 54 |
54 static_assert(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheri
tedData), "StyleRareInheritedData should stay small"); | 55 static_assert(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheri
tedData), "StyleRareInheritedData should stay small"); |
55 | 56 |
56 StyleRareInheritedData::StyleRareInheritedData() | 57 StyleRareInheritedData::StyleRareInheritedData() |
57 : listStyleImage(ComputedStyle::initialListStyleImage()) | 58 : listStyleImage(ComputedStyle::initialListStyleImage()) |
58 , textStrokeWidth(ComputedStyle::initialTextStrokeWidth()) | 59 , textStrokeWidth(ComputedStyle::initialTextStrokeWidth()) |
59 , indent(ComputedStyle::initialTextIndent()) | 60 , indent(ComputedStyle::initialTextIndent()) |
60 , m_effectiveZoom(ComputedStyle::initialZoom()) | 61 , m_effectiveZoom(ComputedStyle::initialZoom()) |
61 , widows(ComputedStyle::initialWidows()) | 62 , widows(ComputedStyle::initialWidows()) |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 , m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute) | 148 , m_selfOrAncestorHasDirAutoAttribute(o.m_selfOrAncestorHasDirAutoAttribute) |
148 , hyphenationString(o.hyphenationString) | 149 , hyphenationString(o.hyphenationString) |
149 , hyphenationLimitBefore(o.hyphenationLimitBefore) | 150 , hyphenationLimitBefore(o.hyphenationLimitBefore) |
150 , hyphenationLimitAfter(o.hyphenationLimitAfter) | 151 , hyphenationLimitAfter(o.hyphenationLimitAfter) |
151 , hyphenationLimitLines(o.hyphenationLimitLines) | 152 , hyphenationLimitLines(o.hyphenationLimitLines) |
152 , locale(o.locale) | 153 , locale(o.locale) |
153 , textEmphasisCustomMark(o.textEmphasisCustomMark) | 154 , textEmphasisCustomMark(o.textEmphasisCustomMark) |
154 , tapHighlightColor(o.tapHighlightColor) | 155 , tapHighlightColor(o.tapHighlightColor) |
155 , appliedTextDecorations(o.appliedTextDecorations) | 156 , appliedTextDecorations(o.appliedTextDecorations) |
156 , m_tabSize(o.m_tabSize) | 157 , m_tabSize(o.m_tabSize) |
| 158 , variables(o.variables) |
157 { | 159 { |
158 } | 160 } |
159 | 161 |
160 StyleRareInheritedData::~StyleRareInheritedData() | 162 StyleRareInheritedData::~StyleRareInheritedData() |
161 { | 163 { |
162 } | 164 } |
163 | 165 |
164 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const | 166 bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const |
165 { | 167 { |
166 return m_textStrokeColor == o.m_textStrokeColor | 168 return m_textStrokeColor == o.m_textStrokeColor |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 && m_selfOrAncestorHasDirAutoAttribute == o.m_selfOrAncestorHasDirAutoAt
tribute | 212 && m_selfOrAncestorHasDirAutoAttribute == o.m_selfOrAncestorHasDirAutoAt
tribute |
211 && hyphenationString == o.hyphenationString | 213 && hyphenationString == o.hyphenationString |
212 && locale == o.locale | 214 && locale == o.locale |
213 && textEmphasisCustomMark == o.textEmphasisCustomMark | 215 && textEmphasisCustomMark == o.textEmphasisCustomMark |
214 && quotesDataEquivalent(o) | 216 && quotesDataEquivalent(o) |
215 && m_tabSize == o.m_tabSize | 217 && m_tabSize == o.m_tabSize |
216 && m_imageRendering == o.m_imageRendering | 218 && m_imageRendering == o.m_imageRendering |
217 && m_textUnderlinePosition == o.m_textUnderlinePosition | 219 && m_textUnderlinePosition == o.m_textUnderlinePosition |
218 && m_rubyPosition == o.m_rubyPosition | 220 && m_rubyPosition == o.m_rubyPosition |
219 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) | 221 && dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) |
220 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations); | 222 && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) |
| 223 && variables == o.variables; |
221 } | 224 } |
222 | 225 |
223 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData&
o) const | 226 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData&
o) const |
224 { | 227 { |
225 return dataEquivalent(textShadow.get(), o.textShadow.get()); | 228 return dataEquivalent(textShadow.get(), o.textShadow.get()); |
226 } | 229 } |
227 | 230 |
228 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData&
o) const | 231 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData&
o) const |
229 { | 232 { |
230 return dataEquivalent(quotes, o.quotes); | 233 return dataEquivalent(quotes, o.quotes); |
231 } | 234 } |
232 | 235 |
233 } // namespace blink | 236 } // namespace blink |
OLD | NEW |