| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 , m_alignItems(RenderStyle::initialAlignItems()) | 55 , m_alignItems(RenderStyle::initialAlignItems()) |
| 56 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm
ent()) | 56 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm
ent()) |
| 57 , m_alignSelf(RenderStyle::initialAlignSelf()) | 57 , m_alignSelf(RenderStyle::initialAlignSelf()) |
| 58 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen
t()) | 58 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen
t()) |
| 59 , m_justifyContent(RenderStyle::initialJustifyContent()) | 59 , m_justifyContent(RenderStyle::initialJustifyContent()) |
| 60 , userDrag(RenderStyle::initialUserDrag()) | 60 , userDrag(RenderStyle::initialUserDrag()) |
| 61 , textOverflow(RenderStyle::initialTextOverflow()) | 61 , textOverflow(RenderStyle::initialTextOverflow()) |
| 62 , marginBeforeCollapse(MCOLLAPSE) | 62 , marginBeforeCollapse(MCOLLAPSE) |
| 63 , marginAfterCollapse(MCOLLAPSE) | 63 , marginAfterCollapse(MCOLLAPSE) |
| 64 , m_borderFit(RenderStyle::initialBorderFit()) | 64 , m_borderFit(RenderStyle::initialBorderFit()) |
| 65 , m_textCombine(RenderStyle::initialTextCombine()) | |
| 66 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) | 65 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) |
| 67 , m_wrapFlow(RenderStyle::initialWrapFlow()) | 66 , m_wrapFlow(RenderStyle::initialWrapFlow()) |
| 68 , m_wrapThrough(RenderStyle::initialWrapThrough()) | 67 , m_wrapThrough(RenderStyle::initialWrapThrough()) |
| 69 , m_hasCurrentOpacityAnimation(false) | 68 , m_hasCurrentOpacityAnimation(false) |
| 70 , m_hasCurrentTransformAnimation(false) | 69 , m_hasCurrentTransformAnimation(false) |
| 71 , m_hasCurrentFilterAnimation(false) | 70 , m_hasCurrentFilterAnimation(false) |
| 72 , m_runningOpacityAnimationOnCompositor(false) | 71 , m_runningOpacityAnimationOnCompositor(false) |
| 73 , m_runningTransformAnimationOnCompositor(false) | 72 , m_runningTransformAnimationOnCompositor(false) |
| 74 , m_runningFilterAnimationOnCompositor(false) | 73 , m_runningFilterAnimationOnCompositor(false) |
| 75 , m_hasAspectRatio(false) | 74 , m_hasAspectRatio(false) |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 , m_alignItems(o.m_alignItems) | 125 , m_alignItems(o.m_alignItems) |
| 127 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) | 126 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) |
| 128 , m_alignSelf(o.m_alignSelf) | 127 , m_alignSelf(o.m_alignSelf) |
| 129 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment) | 128 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment) |
| 130 , m_justifyContent(o.m_justifyContent) | 129 , m_justifyContent(o.m_justifyContent) |
| 131 , userDrag(o.userDrag) | 130 , userDrag(o.userDrag) |
| 132 , textOverflow(o.textOverflow) | 131 , textOverflow(o.textOverflow) |
| 133 , marginBeforeCollapse(o.marginBeforeCollapse) | 132 , marginBeforeCollapse(o.marginBeforeCollapse) |
| 134 , marginAfterCollapse(o.marginAfterCollapse) | 133 , marginAfterCollapse(o.marginAfterCollapse) |
| 135 , m_borderFit(o.m_borderFit) | 134 , m_borderFit(o.m_borderFit) |
| 136 , m_textCombine(o.m_textCombine) | |
| 137 , m_textDecorationStyle(o.m_textDecorationStyle) | 135 , m_textDecorationStyle(o.m_textDecorationStyle) |
| 138 , m_wrapFlow(o.m_wrapFlow) | 136 , m_wrapFlow(o.m_wrapFlow) |
| 139 , m_wrapThrough(o.m_wrapThrough) | 137 , m_wrapThrough(o.m_wrapThrough) |
| 140 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation) | 138 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation) |
| 141 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation) | 139 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation) |
| 142 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation) | 140 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation) |
| 143 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi
tor) | 141 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi
tor) |
| 144 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom
positor) | 142 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom
positor) |
| 145 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito
r) | 143 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito
r) |
| 146 , m_hasAspectRatio(o.m_hasAspectRatio) | 144 , m_hasAspectRatio(o.m_hasAspectRatio) |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 && m_alignItems == o.m_alignItems | 198 && m_alignItems == o.m_alignItems |
| 201 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment | 199 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment |
| 202 && m_alignSelf == o.m_alignSelf | 200 && m_alignSelf == o.m_alignSelf |
| 203 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment | 201 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment |
| 204 && m_justifyContent == o.m_justifyContent | 202 && m_justifyContent == o.m_justifyContent |
| 205 && userDrag == o.userDrag | 203 && userDrag == o.userDrag |
| 206 && textOverflow == o.textOverflow | 204 && textOverflow == o.textOverflow |
| 207 && marginBeforeCollapse == o.marginBeforeCollapse | 205 && marginBeforeCollapse == o.marginBeforeCollapse |
| 208 && marginAfterCollapse == o.marginAfterCollapse | 206 && marginAfterCollapse == o.marginAfterCollapse |
| 209 && m_borderFit == o.m_borderFit | 207 && m_borderFit == o.m_borderFit |
| 210 && m_textCombine == o.m_textCombine | |
| 211 && m_textDecorationStyle == o.m_textDecorationStyle | 208 && m_textDecorationStyle == o.m_textDecorationStyle |
| 212 && m_wrapFlow == o.m_wrapFlow | 209 && m_wrapFlow == o.m_wrapFlow |
| 213 && m_wrapThrough == o.m_wrapThrough | 210 && m_wrapThrough == o.m_wrapThrough |
| 214 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation | 211 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation |
| 215 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation | 212 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation |
| 216 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation | 213 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation |
| 217 && m_effectiveBlendMode == o.m_effectiveBlendMode | 214 && m_effectiveBlendMode == o.m_effectiveBlendMode |
| 218 && m_hasAspectRatio == o.m_hasAspectRatio | 215 && m_hasAspectRatio == o.m_hasAspectRatio |
| 219 && m_touchAction == o.m_touchAction | 216 && m_touchAction == o.m_touchAction |
| 220 && m_objectFit == o.m_objectFit | 217 && m_objectFit == o.m_objectFit |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 return false; | 266 return false; |
| 270 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); | 267 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); |
| 271 } | 268 } |
| 272 | 269 |
| 273 bool StyleRareNonInheritedData::hasFilters() const | 270 bool StyleRareNonInheritedData::hasFilters() const |
| 274 { | 271 { |
| 275 return m_filter.get() && !m_filter->m_operations.isEmpty(); | 272 return m_filter.get() && !m_filter->m_operations.isEmpty(); |
| 276 } | 273 } |
| 277 | 274 |
| 278 } // namespace blink | 275 } // namespace blink |
| OLD | NEW |