| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 , m_textCombine(RenderStyle::initialTextCombine()) | 73 , m_textCombine(RenderStyle::initialTextCombine()) |
| 74 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) | 74 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) |
| 75 , m_wrapFlow(RenderStyle::initialWrapFlow()) | 75 , m_wrapFlow(RenderStyle::initialWrapFlow()) |
| 76 , m_wrapThrough(RenderStyle::initialWrapThrough()) | 76 , m_wrapThrough(RenderStyle::initialWrapThrough()) |
| 77 , m_runningAcceleratedAnimation(false) | 77 , m_runningAcceleratedAnimation(false) |
| 78 , m_hasAspectRatio(false) | 78 , m_hasAspectRatio(false) |
| 79 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) | 79 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) |
| 80 , m_touchAction(RenderStyle::initialTouchAction()) | 80 , m_touchAction(RenderStyle::initialTouchAction()) |
| 81 , m_objectFit(RenderStyle::initialObjectFit()) | 81 , m_objectFit(RenderStyle::initialObjectFit()) |
| 82 , m_isolation(RenderStyle::initialIsolation()) | 82 , m_isolation(RenderStyle::initialIsolation()) |
| 83 , m_justifySelf(RenderStyle::initialJustifySelf()) |
| 84 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig
nment()) |
| 83 { | 85 { |
| 84 m_maskBoxImage.setMaskDefaults(); | 86 m_maskBoxImage.setMaskDefaults(); |
| 85 } | 87 } |
| 86 | 88 |
| 87 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
Data& o) | 89 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
Data& o) |
| 88 : RefCounted<StyleRareNonInheritedData>() | 90 : RefCounted<StyleRareNonInheritedData>() |
| 89 , opacity(o.opacity) | 91 , opacity(o.opacity) |
| 90 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) | 92 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) |
| 91 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) | 93 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) |
| 92 , m_perspective(o.m_perspective) | 94 , m_perspective(o.m_perspective) |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 , m_textCombine(o.m_textCombine) | 151 , m_textCombine(o.m_textCombine) |
| 150 , m_textDecorationStyle(o.m_textDecorationStyle) | 152 , m_textDecorationStyle(o.m_textDecorationStyle) |
| 151 , m_wrapFlow(o.m_wrapFlow) | 153 , m_wrapFlow(o.m_wrapFlow) |
| 152 , m_wrapThrough(o.m_wrapThrough) | 154 , m_wrapThrough(o.m_wrapThrough) |
| 153 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) | 155 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) |
| 154 , m_hasAspectRatio(o.m_hasAspectRatio) | 156 , m_hasAspectRatio(o.m_hasAspectRatio) |
| 155 , m_effectiveBlendMode(o.m_effectiveBlendMode) | 157 , m_effectiveBlendMode(o.m_effectiveBlendMode) |
| 156 , m_touchAction(o.m_touchAction) | 158 , m_touchAction(o.m_touchAction) |
| 157 , m_objectFit(o.m_objectFit) | 159 , m_objectFit(o.m_objectFit) |
| 158 , m_isolation(o.m_isolation) | 160 , m_isolation(o.m_isolation) |
| 161 , m_justifySelf(o.m_justifySelf) |
| 162 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) |
| 159 { | 163 { |
| 160 } | 164 } |
| 161 | 165 |
| 162 StyleRareNonInheritedData::~StyleRareNonInheritedData() | 166 StyleRareNonInheritedData::~StyleRareNonInheritedData() |
| 163 { | 167 { |
| 164 const FilterOperations& filterOperations = m_filter->m_operations; | 168 const FilterOperations& filterOperations = m_filter->m_operations; |
| 165 for (unsigned i = 0; i < filterOperations.size(); ++i) | 169 for (unsigned i = 0; i < filterOperations.size(); ++i) |
| 166 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations.
at(i)); | 170 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations.
at(i)); |
| 167 } | 171 } |
| 168 | 172 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 && m_borderFit == o.m_borderFit | 235 && m_borderFit == o.m_borderFit |
| 232 && m_textCombine == o.m_textCombine | 236 && m_textCombine == o.m_textCombine |
| 233 && m_textDecorationStyle == o.m_textDecorationStyle | 237 && m_textDecorationStyle == o.m_textDecorationStyle |
| 234 && m_wrapFlow == o.m_wrapFlow | 238 && m_wrapFlow == o.m_wrapFlow |
| 235 && m_wrapThrough == o.m_wrapThrough | 239 && m_wrapThrough == o.m_wrapThrough |
| 236 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation | 240 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation |
| 237 && m_effectiveBlendMode == o.m_effectiveBlendMode | 241 && m_effectiveBlendMode == o.m_effectiveBlendMode |
| 238 && m_hasAspectRatio == o.m_hasAspectRatio | 242 && m_hasAspectRatio == o.m_hasAspectRatio |
| 239 && m_touchAction == o.m_touchAction | 243 && m_touchAction == o.m_touchAction |
| 240 && m_objectFit == o.m_objectFit | 244 && m_objectFit == o.m_objectFit |
| 241 && m_isolation == o.m_isolation; | 245 && m_isolation == o.m_isolation |
| 246 && m_justifySelf == o.m_justifySelf |
| 247 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment; |
| 242 } | 248 } |
| 243 | 249 |
| 244 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite
dData& o) const | 250 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite
dData& o) const |
| 245 { | 251 { |
| 246 ContentData* a = m_content.get(); | 252 ContentData* a = m_content.get(); |
| 247 ContentData* b = o.m_content.get(); | 253 ContentData* b = o.m_content.get(); |
| 248 | 254 |
| 249 while (a && b && *a == *b) { | 255 while (a && b && *a == *b) { |
| 250 a = a->next(); | 256 a = a->next(); |
| 251 b = b->next(); | 257 b = b->next(); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 return false; | 307 return false; |
| 302 return true; | 308 return true; |
| 303 } | 309 } |
| 304 | 310 |
| 305 bool StyleRareNonInheritedData::hasFilters() const | 311 bool StyleRareNonInheritedData::hasFilters() const |
| 306 { | 312 { |
| 307 return m_filter.get() && !m_filter->m_operations.isEmpty(); | 313 return m_filter.get() && !m_filter->m_operations.isEmpty(); |
| 308 } | 314 } |
| 309 | 315 |
| 310 } // namespace WebCore | 316 } // namespace WebCore |
| OLD | NEW |