| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 , m_appearance(RenderStyle::initialAppearance()) | 75 , m_appearance(RenderStyle::initialAppearance()) |
| 76 , m_borderFit(RenderStyle::initialBorderFit()) | 76 , m_borderFit(RenderStyle::initialBorderFit()) |
| 77 , m_textCombine(RenderStyle::initialTextCombine()) | 77 , m_textCombine(RenderStyle::initialTextCombine()) |
| 78 #if ENABLE(CSS3_TEXT) | 78 #if ENABLE(CSS3_TEXT) |
| 79 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) | 79 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) |
| 80 #endif // CSS3_TEXT | 80 #endif // CSS3_TEXT |
| 81 , m_wrapFlow(RenderStyle::initialWrapFlow()) | 81 , m_wrapFlow(RenderStyle::initialWrapFlow()) |
| 82 , m_wrapThrough(RenderStyle::initialWrapThrough()) | 82 , m_wrapThrough(RenderStyle::initialWrapThrough()) |
| 83 , m_runningAcceleratedAnimation(false) | 83 , m_runningAcceleratedAnimation(false) |
| 84 , m_hasAspectRatio(false) | 84 , m_hasAspectRatio(false) |
| 85 #if ENABLE(CSS_COMPOSITING) | |
| 86 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) | 85 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) |
| 87 #endif | |
| 88 { | 86 { |
| 89 m_maskBoxImage.setMaskDefaults(); | 87 m_maskBoxImage.setMaskDefaults(); |
| 90 } | 88 } |
| 91 | 89 |
| 92 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
Data& o) | 90 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
Data& o) |
| 93 : RefCounted<StyleRareNonInheritedData>() | 91 : RefCounted<StyleRareNonInheritedData>() |
| 94 , opacity(o.opacity) | 92 , opacity(o.opacity) |
| 95 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) | 93 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) |
| 96 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) | 94 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) |
| 97 , m_perspective(o.m_perspective) | 95 , m_perspective(o.m_perspective) |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 , m_appearance(o.m_appearance) | 152 , m_appearance(o.m_appearance) |
| 155 , m_borderFit(o.m_borderFit) | 153 , m_borderFit(o.m_borderFit) |
| 156 , m_textCombine(o.m_textCombine) | 154 , m_textCombine(o.m_textCombine) |
| 157 #if ENABLE(CSS3_TEXT) | 155 #if ENABLE(CSS3_TEXT) |
| 158 , m_textDecorationStyle(o.m_textDecorationStyle) | 156 , m_textDecorationStyle(o.m_textDecorationStyle) |
| 159 #endif // CSS3_TEXT | 157 #endif // CSS3_TEXT |
| 160 , m_wrapFlow(o.m_wrapFlow) | 158 , m_wrapFlow(o.m_wrapFlow) |
| 161 , m_wrapThrough(o.m_wrapThrough) | 159 , m_wrapThrough(o.m_wrapThrough) |
| 162 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) | 160 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) |
| 163 , m_hasAspectRatio(o.m_hasAspectRatio) | 161 , m_hasAspectRatio(o.m_hasAspectRatio) |
| 164 #if ENABLE(CSS_COMPOSITING) | |
| 165 , m_effectiveBlendMode(o.m_effectiveBlendMode) | 162 , m_effectiveBlendMode(o.m_effectiveBlendMode) |
| 166 #endif | |
| 167 { | 163 { |
| 168 } | 164 } |
| 169 | 165 |
| 170 StyleRareNonInheritedData::~StyleRareNonInheritedData() | 166 StyleRareNonInheritedData::~StyleRareNonInheritedData() |
| 171 { | 167 { |
| 172 } | 168 } |
| 173 | 169 |
| 174 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
onst | 170 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
onst |
| 175 { | 171 { |
| 176 return opacity == o.opacity | 172 return opacity == o.opacity |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 && marginAfterCollapse == o.marginAfterCollapse | 231 && marginAfterCollapse == o.marginAfterCollapse |
| 236 && m_appearance == o.m_appearance | 232 && m_appearance == o.m_appearance |
| 237 && m_borderFit == o.m_borderFit | 233 && m_borderFit == o.m_borderFit |
| 238 && m_textCombine == o.m_textCombine | 234 && m_textCombine == o.m_textCombine |
| 239 #if ENABLE(CSS3_TEXT) | 235 #if ENABLE(CSS3_TEXT) |
| 240 && m_textDecorationStyle == o.m_textDecorationStyle | 236 && m_textDecorationStyle == o.m_textDecorationStyle |
| 241 #endif // CSS3_TEXT | 237 #endif // CSS3_TEXT |
| 242 && m_wrapFlow == o.m_wrapFlow | 238 && m_wrapFlow == o.m_wrapFlow |
| 243 && m_wrapThrough == o.m_wrapThrough | 239 && m_wrapThrough == o.m_wrapThrough |
| 244 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation | 240 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation |
| 245 #if ENABLE(CSS_COMPOSITING) | |
| 246 && m_effectiveBlendMode == o.m_effectiveBlendMode | 241 && m_effectiveBlendMode == o.m_effectiveBlendMode |
| 247 #endif | |
| 248 && m_hasAspectRatio == o.m_hasAspectRatio; | 242 && m_hasAspectRatio == o.m_hasAspectRatio; |
| 249 } | 243 } |
| 250 | 244 |
| 251 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite
dData& o) const | 245 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite
dData& o) const |
| 252 { | 246 { |
| 253 ContentData* a = m_content.get(); | 247 ContentData* a = m_content.get(); |
| 254 ContentData* b = o.m_content.get(); | 248 ContentData* b = o.m_content.get(); |
| 255 | 249 |
| 256 while (a && b && *a == *b) { | 250 while (a && b && *a == *b) { |
| 257 a = a->next(); | 251 a = a->next(); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 info.addMember(m_regionThread, "regionThread"); | 329 info.addMember(m_regionThread, "regionThread"); |
| 336 | 330 |
| 337 info.ignoreMember(m_perspectiveOriginX); | 331 info.ignoreMember(m_perspectiveOriginX); |
| 338 info.ignoreMember(m_perspectiveOriginY); | 332 info.ignoreMember(m_perspectiveOriginY); |
| 339 info.ignoreMember(m_pageSize); | 333 info.ignoreMember(m_pageSize); |
| 340 info.ignoreMember(m_shapeMargin); | 334 info.ignoreMember(m_shapeMargin); |
| 341 info.ignoreMember(m_shapePadding); | 335 info.ignoreMember(m_shapePadding); |
| 342 } | 336 } |
| 343 | 337 |
| 344 } // namespace WebCore | 338 } // namespace WebCore |
| OLD | NEW |