| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 , m_justifyItems(ComputedStyle::initialJustifyItems()) | 89 , m_justifyItems(ComputedStyle::initialJustifyItems()) |
| 90 , m_justifyItemsOverflowAlignment(ComputedStyle::initialJustifyItemsOverflow
Alignment()) | 90 , m_justifyItemsOverflowAlignment(ComputedStyle::initialJustifyItemsOverflow
Alignment()) |
| 91 , m_justifyItemsPositionType(ComputedStyle::initialJustifyItemsPositionType(
)) | 91 , m_justifyItemsPositionType(ComputedStyle::initialJustifyItemsPositionType(
)) |
| 92 , m_justifySelf(ComputedStyle::initialJustifySelf()) | 92 , m_justifySelf(ComputedStyle::initialJustifySelf()) |
| 93 , m_justifySelfOverflowAlignment(ComputedStyle::initialJustifySelfOverflowAl
ignment()) | 93 , m_justifySelfOverflowAlignment(ComputedStyle::initialJustifySelfOverflowAl
ignment()) |
| 94 , m_scrollBehavior(ComputedStyle::initialScrollBehavior()) | 94 , m_scrollBehavior(ComputedStyle::initialScrollBehavior()) |
| 95 , m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn()) | 95 , m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn()) |
| 96 , m_requiresAcceleratedCompositingForExternalReasons(false) | 96 , m_requiresAcceleratedCompositingForExternalReasons(false) |
| 97 , m_hasInlineTransform(false) | 97 , m_hasInlineTransform(false) |
| 98 , m_resize(ComputedStyle::initialResize()) | 98 , m_resize(ComputedStyle::initialResize()) |
| 99 , m_hasCompositorProxy(false) |
| 99 { | 100 { |
| 100 m_maskBoxImage.setMaskDefaults(); | 101 m_maskBoxImage.setMaskDefaults(); |
| 101 } | 102 } |
| 102 | 103 |
| 103 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
Data& o) | 104 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
Data& o) |
| 104 : RefCounted<StyleRareNonInheritedData>() | 105 : RefCounted<StyleRareNonInheritedData>() |
| 105 , opacity(o.opacity) | 106 , opacity(o.opacity) |
| 106 , m_perspective(o.m_perspective) | 107 , m_perspective(o.m_perspective) |
| 107 , m_perspectiveOrigin(o.m_perspectiveOrigin) | 108 , m_perspectiveOrigin(o.m_perspectiveOrigin) |
| 108 , lineClamp(o.lineClamp) | 109 , lineClamp(o.lineClamp) |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 , m_justifyItems(o.m_justifyItems) | 174 , m_justifyItems(o.m_justifyItems) |
| 174 , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment) | 175 , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment) |
| 175 , m_justifyItemsPositionType(o.m_justifyItemsPositionType) | 176 , m_justifyItemsPositionType(o.m_justifyItemsPositionType) |
| 176 , m_justifySelf(o.m_justifySelf) | 177 , m_justifySelf(o.m_justifySelf) |
| 177 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) | 178 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) |
| 178 , m_scrollBehavior(o.m_scrollBehavior) | 179 , m_scrollBehavior(o.m_scrollBehavior) |
| 179 , m_scrollBlocksOn(o.m_scrollBlocksOn) | 180 , m_scrollBlocksOn(o.m_scrollBlocksOn) |
| 180 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated
CompositingForExternalReasons) | 181 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated
CompositingForExternalReasons) |
| 181 , m_hasInlineTransform(o.m_hasInlineTransform) | 182 , m_hasInlineTransform(o.m_hasInlineTransform) |
| 182 , m_resize(o.m_resize) | 183 , m_resize(o.m_resize) |
| 184 , m_hasCompositorProxy(o.m_hasCompositorProxy) |
| 183 { | 185 { |
| 184 } | 186 } |
| 185 | 187 |
| 186 StyleRareNonInheritedData::~StyleRareNonInheritedData() | 188 StyleRareNonInheritedData::~StyleRareNonInheritedData() |
| 187 { | 189 { |
| 188 const FilterOperations& filterOperations = m_filter->m_operations; | 190 const FilterOperations& filterOperations = m_filter->m_operations; |
| 189 for (unsigned i = 0; i < filterOperations.size(); ++i) | 191 for (unsigned i = 0; i < filterOperations.size(); ++i) |
| 190 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations.
at(i)); | 192 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations.
at(i)); |
| 191 } | 193 } |
| 192 | 194 |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 && m_isolation == o.m_isolation | 262 && m_isolation == o.m_isolation |
| 261 && m_justifyItems == o.m_justifyItems | 263 && m_justifyItems == o.m_justifyItems |
| 262 && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment | 264 && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment |
| 263 && m_justifyItemsPositionType == o.m_justifyItemsPositionType | 265 && m_justifyItemsPositionType == o.m_justifyItemsPositionType |
| 264 && m_justifySelf == o.m_justifySelf | 266 && m_justifySelf == o.m_justifySelf |
| 265 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment | 267 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment |
| 266 && m_scrollBehavior == o.m_scrollBehavior | 268 && m_scrollBehavior == o.m_scrollBehavior |
| 267 && m_scrollBlocksOn == o.m_scrollBlocksOn | 269 && m_scrollBlocksOn == o.m_scrollBlocksOn |
| 268 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc
eleratedCompositingForExternalReasons | 270 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc
eleratedCompositingForExternalReasons |
| 269 && m_hasInlineTransform == o.m_hasInlineTransform | 271 && m_hasInlineTransform == o.m_hasInlineTransform |
| 270 && m_resize == o.m_resize; | 272 && m_resize == o.m_resize |
| 273 && m_hasCompositorProxy == o.m_hasCompositorProxy; |
| 271 } | 274 } |
| 272 | 275 |
| 273 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite
dData& o) const | 276 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite
dData& o) const |
| 274 { | 277 { |
| 275 ContentData* a = m_content.get(); | 278 ContentData* a = m_content.get(); |
| 276 ContentData* b = o.m_content.get(); | 279 ContentData* b = o.m_content.get(); |
| 277 | 280 |
| 278 while (a && b && *a == *b) { | 281 while (a && b && *a == *b) { |
| 279 a = a->next(); | 282 a = a->next(); |
| 280 b = b->next(); | 283 b = b->next(); |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 { | 328 { |
| 326 return dataEquivalent(m_shapeOutside, o.m_shapeOutside); | 329 return dataEquivalent(m_shapeOutside, o.m_shapeOutside); |
| 327 } | 330 } |
| 328 | 331 |
| 329 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit
edData& o) const | 332 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit
edData& o) const |
| 330 { | 333 { |
| 331 return dataEquivalent(m_clipPath, o.m_clipPath); | 334 return dataEquivalent(m_clipPath, o.m_clipPath); |
| 332 } | 335 } |
| 333 | 336 |
| 334 } // namespace blink | 337 } // namespace blink |
| OLD | NEW |