| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 , m_wrapFlow(RenderStyle::initialWrapFlow()) | 84 , m_wrapFlow(RenderStyle::initialWrapFlow()) |
| 85 , m_wrapThrough(RenderStyle::initialWrapThrough()) | 85 , m_wrapThrough(RenderStyle::initialWrapThrough()) |
| 86 , m_runningAcceleratedAnimation(false) | 86 , m_runningAcceleratedAnimation(false) |
| 87 , m_hasAspectRatio(false) | 87 , m_hasAspectRatio(false) |
| 88 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) | 88 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) |
| 89 , m_touchAction(RenderStyle::initialTouchAction()) | 89 , m_touchAction(RenderStyle::initialTouchAction()) |
| 90 , m_objectFit(RenderStyle::initialObjectFit()) | 90 , m_objectFit(RenderStyle::initialObjectFit()) |
| 91 , m_isolation(RenderStyle::initialIsolation()) | 91 , m_isolation(RenderStyle::initialIsolation()) |
| 92 , m_justifySelf(RenderStyle::initialJustifySelf()) | 92 , m_justifySelf(RenderStyle::initialJustifySelf()) |
| 93 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig
nment()) | 93 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig
nment()) |
| 94 , m_scrollBehavior(RenderStyle::initialScrollBehavior()) |
| 94 { | 95 { |
| 95 m_maskBoxImage.setMaskDefaults(); | 96 m_maskBoxImage.setMaskDefaults(); |
| 96 } | 97 } |
| 97 | 98 |
| 98 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
Data& o) | 99 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
Data& o) |
| 99 : RefCounted<StyleRareNonInheritedData>() | 100 : RefCounted<StyleRareNonInheritedData>() |
| 100 , opacity(o.opacity) | 101 , opacity(o.opacity) |
| 101 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) | 102 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) |
| 102 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) | 103 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) |
| 103 , m_perspective(o.m_perspective) | 104 , m_perspective(o.m_perspective) |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 , m_wrapFlow(o.m_wrapFlow) | 165 , m_wrapFlow(o.m_wrapFlow) |
| 165 , m_wrapThrough(o.m_wrapThrough) | 166 , m_wrapThrough(o.m_wrapThrough) |
| 166 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) | 167 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) |
| 167 , m_hasAspectRatio(o.m_hasAspectRatio) | 168 , m_hasAspectRatio(o.m_hasAspectRatio) |
| 168 , m_effectiveBlendMode(o.m_effectiveBlendMode) | 169 , m_effectiveBlendMode(o.m_effectiveBlendMode) |
| 169 , m_touchAction(o.m_touchAction) | 170 , m_touchAction(o.m_touchAction) |
| 170 , m_objectFit(o.m_objectFit) | 171 , m_objectFit(o.m_objectFit) |
| 171 , m_isolation(o.m_isolation) | 172 , m_isolation(o.m_isolation) |
| 172 , m_justifySelf(o.m_justifySelf) | 173 , m_justifySelf(o.m_justifySelf) |
| 173 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) | 174 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) |
| 175 , m_scrollBehavior(o.m_scrollBehavior) |
| 174 { | 176 { |
| 175 } | 177 } |
| 176 | 178 |
| 177 StyleRareNonInheritedData::~StyleRareNonInheritedData() | 179 StyleRareNonInheritedData::~StyleRareNonInheritedData() |
| 178 { | 180 { |
| 179 const FilterOperations& filterOperations = m_filter->m_operations; | 181 const FilterOperations& filterOperations = m_filter->m_operations; |
| 180 for (unsigned i = 0; i < filterOperations.size(); ++i) | 182 for (unsigned i = 0; i < filterOperations.size(); ++i) |
| 181 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations.
at(i)); | 183 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations.
at(i)); |
| 182 } | 184 } |
| 183 | 185 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 && m_textDecorationStyle == o.m_textDecorationStyle | 252 && m_textDecorationStyle == o.m_textDecorationStyle |
| 251 && m_wrapFlow == o.m_wrapFlow | 253 && m_wrapFlow == o.m_wrapFlow |
| 252 && m_wrapThrough == o.m_wrapThrough | 254 && m_wrapThrough == o.m_wrapThrough |
| 253 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation | 255 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation |
| 254 && m_effectiveBlendMode == o.m_effectiveBlendMode | 256 && m_effectiveBlendMode == o.m_effectiveBlendMode |
| 255 && m_hasAspectRatio == o.m_hasAspectRatio | 257 && m_hasAspectRatio == o.m_hasAspectRatio |
| 256 && m_touchAction == o.m_touchAction | 258 && m_touchAction == o.m_touchAction |
| 257 && m_objectFit == o.m_objectFit | 259 && m_objectFit == o.m_objectFit |
| 258 && m_isolation == o.m_isolation | 260 && m_isolation == o.m_isolation |
| 259 && m_justifySelf == o.m_justifySelf | 261 && m_justifySelf == o.m_justifySelf |
| 260 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment; | 262 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment |
| 263 && m_scrollBehavior == o.m_scrollBehavior; |
| 261 } | 264 } |
| 262 | 265 |
| 263 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite
dData& o) const | 266 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite
dData& o) const |
| 264 { | 267 { |
| 265 ContentData* a = m_content.get(); | 268 ContentData* a = m_content.get(); |
| 266 ContentData* b = o.m_content.get(); | 269 ContentData* b = o.m_content.get(); |
| 267 | 270 |
| 268 while (a && b && *a == *b) { | 271 while (a && b && *a == *b) { |
| 269 a = a->next(); | 272 a = a->next(); |
| 270 b = b->next(); | 273 b = b->next(); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 return false; | 323 return false; |
| 321 return true; | 324 return true; |
| 322 } | 325 } |
| 323 | 326 |
| 324 bool StyleRareNonInheritedData::hasFilters() const | 327 bool StyleRareNonInheritedData::hasFilters() const |
| 325 { | 328 { |
| 326 return m_filter.get() && !m_filter->m_operations.isEmpty(); | 329 return m_filter.get() && !m_filter->m_operations.isEmpty(); |
| 327 } | 330 } |
| 328 | 331 |
| 329 } // namespace WebCore | 332 } // namespace WebCore |
| OLD | NEW |