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 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 , m_textCombine(RenderStyle::initialTextCombine()) | 72 , m_textCombine(RenderStyle::initialTextCombine()) |
73 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) | 73 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) |
74 , m_wrapFlow(RenderStyle::initialWrapFlow()) | 74 , m_wrapFlow(RenderStyle::initialWrapFlow()) |
75 , m_wrapThrough(RenderStyle::initialWrapThrough()) | 75 , m_wrapThrough(RenderStyle::initialWrapThrough()) |
76 , m_runningAcceleratedAnimation(false) | 76 , m_runningAcceleratedAnimation(false) |
77 , m_hasAspectRatio(false) | 77 , m_hasAspectRatio(false) |
78 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) | 78 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) |
79 , m_touchAction(RenderStyle::initialTouchAction()) | 79 , m_touchAction(RenderStyle::initialTouchAction()) |
80 , m_objectFit(RenderStyle::initialObjectFit()) | 80 , m_objectFit(RenderStyle::initialObjectFit()) |
81 , m_isolation(RenderStyle::initialIsolation()) | 81 , m_isolation(RenderStyle::initialIsolation()) |
| 82 , m_justifySelf(RenderStyle::initialJustifySelf()) |
| 83 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig
nment()) |
82 { | 84 { |
83 m_maskBoxImage.setMaskDefaults(); | 85 m_maskBoxImage.setMaskDefaults(); |
84 } | 86 } |
85 | 87 |
86 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
Data& o) | 88 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
Data& o) |
87 : RefCounted<StyleRareNonInheritedData>() | 89 : RefCounted<StyleRareNonInheritedData>() |
88 , opacity(o.opacity) | 90 , opacity(o.opacity) |
89 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) | 91 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) |
90 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) | 92 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) |
91 , m_perspective(o.m_perspective) | 93 , m_perspective(o.m_perspective) |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 , m_textCombine(o.m_textCombine) | 150 , m_textCombine(o.m_textCombine) |
149 , m_textDecorationStyle(o.m_textDecorationStyle) | 151 , m_textDecorationStyle(o.m_textDecorationStyle) |
150 , m_wrapFlow(o.m_wrapFlow) | 152 , m_wrapFlow(o.m_wrapFlow) |
151 , m_wrapThrough(o.m_wrapThrough) | 153 , m_wrapThrough(o.m_wrapThrough) |
152 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) | 154 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) |
153 , m_hasAspectRatio(o.m_hasAspectRatio) | 155 , m_hasAspectRatio(o.m_hasAspectRatio) |
154 , m_effectiveBlendMode(o.m_effectiveBlendMode) | 156 , m_effectiveBlendMode(o.m_effectiveBlendMode) |
155 , m_touchAction(o.m_touchAction) | 157 , m_touchAction(o.m_touchAction) |
156 , m_objectFit(o.m_objectFit) | 158 , m_objectFit(o.m_objectFit) |
157 , m_isolation(o.m_isolation) | 159 , m_isolation(o.m_isolation) |
| 160 , m_justifySelf(o.m_justifySelf) |
| 161 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) |
158 { | 162 { |
159 } | 163 } |
160 | 164 |
161 StyleRareNonInheritedData::~StyleRareNonInheritedData() | 165 StyleRareNonInheritedData::~StyleRareNonInheritedData() |
162 { | 166 { |
163 } | 167 } |
164 | 168 |
165 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
onst | 169 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
onst |
166 { | 170 { |
167 return opacity == o.opacity | 171 return opacity == o.opacity |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 && m_borderFit == o.m_borderFit | 231 && m_borderFit == o.m_borderFit |
228 && m_textCombine == o.m_textCombine | 232 && m_textCombine == o.m_textCombine |
229 && m_textDecorationStyle == o.m_textDecorationStyle | 233 && m_textDecorationStyle == o.m_textDecorationStyle |
230 && m_wrapFlow == o.m_wrapFlow | 234 && m_wrapFlow == o.m_wrapFlow |
231 && m_wrapThrough == o.m_wrapThrough | 235 && m_wrapThrough == o.m_wrapThrough |
232 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation | 236 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation |
233 && m_effectiveBlendMode == o.m_effectiveBlendMode | 237 && m_effectiveBlendMode == o.m_effectiveBlendMode |
234 && m_hasAspectRatio == o.m_hasAspectRatio | 238 && m_hasAspectRatio == o.m_hasAspectRatio |
235 && m_touchAction == o.m_touchAction | 239 && m_touchAction == o.m_touchAction |
236 && m_objectFit == o.m_objectFit | 240 && m_objectFit == o.m_objectFit |
237 && m_isolation == o.m_isolation; | 241 && m_isolation == o.m_isolation |
| 242 && m_justifySelf == o.m_justifySelf |
| 243 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment; |
238 } | 244 } |
239 | 245 |
240 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite
dData& o) const | 246 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite
dData& o) const |
241 { | 247 { |
242 ContentData* a = m_content.get(); | 248 ContentData* a = m_content.get(); |
243 ContentData* b = o.m_content.get(); | 249 ContentData* b = o.m_content.get(); |
244 | 250 |
245 while (a && b && *a == *b) { | 251 while (a && b && *a == *b) { |
246 a = a->next(); | 252 a = a->next(); |
247 b = b->next(); | 253 b = b->next(); |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 return false; | 303 return false; |
298 return true; | 304 return true; |
299 } | 305 } |
300 | 306 |
301 bool StyleRareNonInheritedData::hasFilters() const | 307 bool StyleRareNonInheritedData::hasFilters() const |
302 { | 308 { |
303 return m_filter.get() && !m_filter->m_operations.isEmpty(); | 309 return m_filter.get() && !m_filter->m_operations.isEmpty(); |
304 } | 310 } |
305 | 311 |
306 } // namespace WebCore | 312 } // namespace WebCore |
OLD | NEW |