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 | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
4 * reserved. | 4 * 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 float secondFloat; | 48 float secondFloat; |
49 unsigned m_bitfields[2]; | 49 unsigned m_bitfields[2]; |
50 short pagedMediaShorts[2]; | 50 short pagedMediaShorts[2]; |
51 short hyphenationShorts[3]; | 51 short hyphenationShorts[3]; |
52 uint8_t lineHeightStep; | 52 uint8_t lineHeightStep; |
53 | 53 |
54 Color touchColors; | 54 Color touchColors; |
55 TabSize tabSize; | 55 TabSize tabSize; |
56 void* variables[1]; | 56 void* variables[1]; |
57 TextSizeAdjust textSizeAdjust; | 57 TextSizeAdjust textSizeAdjust; |
| 58 UnzoomedLength unzoomedLengths[1]; |
58 }; | 59 }; |
59 | 60 |
60 static_assert(sizeof(StyleRareInheritedData) <= | 61 static_assert(sizeof(StyleRareInheritedData) <= |
61 sizeof(SameSizeAsStyleRareInheritedData), | 62 sizeof(SameSizeAsStyleRareInheritedData), |
62 "StyleRareInheritedData should stay small"); | 63 "StyleRareInheritedData should stay small"); |
63 | 64 |
64 StyleRareInheritedData::StyleRareInheritedData() | 65 StyleRareInheritedData::StyleRareInheritedData() |
65 : listStyleImage(ComputedStyle::initialListStyleImage()), | 66 : listStyleImage(ComputedStyle::initialListStyleImage()), |
66 textStrokeWidth(ComputedStyle::initialTextStrokeWidth()), | 67 textStrokeWidth(ComputedStyle::initialTextStrokeWidth()), |
67 indent(ComputedStyle::initialTextIndent()), | 68 indent(ComputedStyle::initialTextIndent()), |
(...skipping 27 matching lines...) Expand all Loading... |
95 m_textCombine(ComputedStyle::initialTextCombine()), | 96 m_textCombine(ComputedStyle::initialTextCombine()), |
96 m_textIndentLine(ComputedStyle::initialTextIndentLine()), | 97 m_textIndentLine(ComputedStyle::initialTextIndentLine()), |
97 m_textIndentType(ComputedStyle::initialTextIndentLine()), | 98 m_textIndentType(ComputedStyle::initialTextIndentLine()), |
98 m_imageRendering(ComputedStyle::initialImageRendering()), | 99 m_imageRendering(ComputedStyle::initialImageRendering()), |
99 m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition()), | 100 m_textUnderlinePosition(ComputedStyle::initialTextUnderlinePosition()), |
100 m_textDecorationSkip(ComputedStyle::initialTextDecorationSkip()), | 101 m_textDecorationSkip(ComputedStyle::initialTextDecorationSkip()), |
101 m_rubyPosition(ComputedStyle::initialRubyPosition()), | 102 m_rubyPosition(ComputedStyle::initialRubyPosition()), |
102 m_subtreeWillChangeContents(false), | 103 m_subtreeWillChangeContents(false), |
103 m_selfOrAncestorHasDirAutoAttribute(false), | 104 m_selfOrAncestorHasDirAutoAttribute(false), |
104 m_respectImageOrientation(false), | 105 m_respectImageOrientation(false), |
| 106 paintOrder(ComputedStyle::initialPaintOrder()), |
| 107 capStyle(ComputedStyle::initialCapStyle()), |
| 108 joinStyle(ComputedStyle::initialJoinStyle()), |
| 109 strokeWidth(ComputedStyle::initialStrokeWidth()), |
105 hyphenationLimitBefore(-1), | 110 hyphenationLimitBefore(-1), |
106 hyphenationLimitAfter(-1), | 111 hyphenationLimitAfter(-1), |
107 hyphenationLimitLines(-1), | 112 hyphenationLimitLines(-1), |
108 m_lineHeightStep(0), | 113 m_lineHeightStep(0), |
109 tapHighlightColor(ComputedStyle::initialTapHighlightColor()), | 114 tapHighlightColor(ComputedStyle::initialTapHighlightColor()), |
110 m_tabSize(ComputedStyle::initialTabSize()), | 115 m_tabSize(ComputedStyle::initialTabSize()), |
111 m_textSizeAdjust(ComputedStyle::initialTextSizeAdjust()) {} | 116 m_textSizeAdjust(ComputedStyle::initialTextSizeAdjust()) {} |
112 | 117 |
113 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) | 118 StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) |
114 : RefCounted<StyleRareInheritedData>(), | 119 : RefCounted<StyleRareInheritedData>(), |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 m_textIndentLine(o.m_textIndentLine), | 166 m_textIndentLine(o.m_textIndentLine), |
162 m_textIndentType(o.m_textIndentType), | 167 m_textIndentType(o.m_textIndentType), |
163 m_imageRendering(o.m_imageRendering), | 168 m_imageRendering(o.m_imageRendering), |
164 m_textUnderlinePosition(o.m_textUnderlinePosition), | 169 m_textUnderlinePosition(o.m_textUnderlinePosition), |
165 m_textDecorationSkip(o.m_textDecorationSkip), | 170 m_textDecorationSkip(o.m_textDecorationSkip), |
166 m_rubyPosition(o.m_rubyPosition), | 171 m_rubyPosition(o.m_rubyPosition), |
167 m_subtreeWillChangeContents(o.m_subtreeWillChangeContents), | 172 m_subtreeWillChangeContents(o.m_subtreeWillChangeContents), |
168 m_selfOrAncestorHasDirAutoAttribute( | 173 m_selfOrAncestorHasDirAutoAttribute( |
169 o.m_selfOrAncestorHasDirAutoAttribute), | 174 o.m_selfOrAncestorHasDirAutoAttribute), |
170 m_respectImageOrientation(o.m_respectImageOrientation), | 175 m_respectImageOrientation(o.m_respectImageOrientation), |
| 176 paintOrder(o.paintOrder), |
| 177 capStyle(o.capStyle), |
| 178 joinStyle(o.joinStyle), |
| 179 strokeWidth(o.strokeWidth), |
171 hyphenationString(o.hyphenationString), | 180 hyphenationString(o.hyphenationString), |
172 hyphenationLimitBefore(o.hyphenationLimitBefore), | 181 hyphenationLimitBefore(o.hyphenationLimitBefore), |
173 hyphenationLimitAfter(o.hyphenationLimitAfter), | 182 hyphenationLimitAfter(o.hyphenationLimitAfter), |
174 hyphenationLimitLines(o.hyphenationLimitLines), | 183 hyphenationLimitLines(o.hyphenationLimitLines), |
175 m_lineHeightStep(o.m_lineHeightStep), | 184 m_lineHeightStep(o.m_lineHeightStep), |
176 textEmphasisCustomMark(o.textEmphasisCustomMark), | 185 textEmphasisCustomMark(o.textEmphasisCustomMark), |
177 tapHighlightColor(o.tapHighlightColor), | 186 tapHighlightColor(o.tapHighlightColor), |
178 appliedTextDecorations(o.appliedTextDecorations), | 187 appliedTextDecorations(o.appliedTextDecorations), |
179 m_tabSize(o.m_tabSize), | 188 m_tabSize(o.m_tabSize), |
180 variables(o.variables), | 189 variables(o.variables), |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
232 m_selfOrAncestorHasDirAutoAttribute == | 241 m_selfOrAncestorHasDirAutoAttribute == |
233 o.m_selfOrAncestorHasDirAutoAttribute && | 242 o.m_selfOrAncestorHasDirAutoAttribute && |
234 m_respectImageOrientation == o.m_respectImageOrientation && | 243 m_respectImageOrientation == o.m_respectImageOrientation && |
235 hyphenationString == o.hyphenationString && | 244 hyphenationString == o.hyphenationString && |
236 m_lineHeightStep == o.m_lineHeightStep && | 245 m_lineHeightStep == o.m_lineHeightStep && |
237 textEmphasisCustomMark == o.textEmphasisCustomMark && | 246 textEmphasisCustomMark == o.textEmphasisCustomMark && |
238 quotesDataEquivalent(o) && m_tabSize == o.m_tabSize && | 247 quotesDataEquivalent(o) && m_tabSize == o.m_tabSize && |
239 m_imageRendering == o.m_imageRendering && | 248 m_imageRendering == o.m_imageRendering && |
240 m_textUnderlinePosition == o.m_textUnderlinePosition && | 249 m_textUnderlinePosition == o.m_textUnderlinePosition && |
241 m_textDecorationSkip == o.m_textDecorationSkip && | 250 m_textDecorationSkip == o.m_textDecorationSkip && |
242 m_rubyPosition == o.m_rubyPosition && | 251 m_rubyPosition == o.m_rubyPosition && paintOrder == o.paintOrder && |
| 252 capStyle == o.capStyle && joinStyle == o.joinStyle && |
| 253 strokeWidth == o.strokeWidth && |
243 dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) && | 254 dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) && |
244 dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) && | 255 dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) && |
245 dataEquivalent(variables, o.variables) && | 256 dataEquivalent(variables, o.variables) && |
246 m_textSizeAdjust == o.m_textSizeAdjust; | 257 m_textSizeAdjust == o.m_textSizeAdjust; |
247 } | 258 } |
248 | 259 |
249 bool StyleRareInheritedData::shadowDataEquivalent( | 260 bool StyleRareInheritedData::shadowDataEquivalent( |
250 const StyleRareInheritedData& o) const { | 261 const StyleRareInheritedData& o) const { |
251 return dataEquivalent(textShadow.get(), o.textShadow.get()); | 262 return dataEquivalent(textShadow.get(), o.textShadow.get()); |
252 } | 263 } |
253 | 264 |
254 bool StyleRareInheritedData::quotesDataEquivalent( | 265 bool StyleRareInheritedData::quotesDataEquivalent( |
255 const StyleRareInheritedData& o) const { | 266 const StyleRareInheritedData& o) const { |
256 return dataEquivalent(quotes, o.quotes); | 267 return dataEquivalent(quotes, o.quotes); |
257 } | 268 } |
258 | 269 |
259 } // namespace blink | 270 } // namespace blink |
OLD | NEW |