| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 , m_alignItems(RenderStyle::initialAlignItems()) | 50 , m_alignItems(RenderStyle::initialAlignItems()) |
| 51 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm
ent()) | 51 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm
ent()) |
| 52 , m_alignSelf(RenderStyle::initialAlignSelf()) | 52 , m_alignSelf(RenderStyle::initialAlignSelf()) |
| 53 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen
t()) | 53 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen
t()) |
| 54 , m_justifyContent(RenderStyle::initialJustifyContent()) | 54 , m_justifyContent(RenderStyle::initialJustifyContent()) |
| 55 , userDrag(RenderStyle::initialUserDrag()) | 55 , userDrag(RenderStyle::initialUserDrag()) |
| 56 , textOverflow(RenderStyle::initialTextOverflow()) | 56 , textOverflow(RenderStyle::initialTextOverflow()) |
| 57 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) | 57 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) |
| 58 , m_wrapFlow(RenderStyle::initialWrapFlow()) | 58 , m_wrapFlow(RenderStyle::initialWrapFlow()) |
| 59 , m_wrapThrough(RenderStyle::initialWrapThrough()) | 59 , m_wrapThrough(RenderStyle::initialWrapThrough()) |
| 60 , m_hasCurrentOpacityAnimation(false) | |
| 61 , m_hasCurrentTransformAnimation(false) | |
| 62 , m_hasCurrentFilterAnimation(false) | |
| 63 , m_runningOpacityAnimationOnCompositor(false) | |
| 64 , m_runningTransformAnimationOnCompositor(false) | |
| 65 , m_runningFilterAnimationOnCompositor(false) | |
| 66 , m_hasAspectRatio(false) | 60 , m_hasAspectRatio(false) |
| 67 , m_touchAction(RenderStyle::initialTouchAction()) | 61 , m_touchAction(RenderStyle::initialTouchAction()) |
| 68 , m_objectFit(RenderStyle::initialObjectFit()) | 62 , m_objectFit(RenderStyle::initialObjectFit()) |
| 69 , m_justifyItems(RenderStyle::initialJustifyItems()) | 63 , m_justifyItems(RenderStyle::initialJustifyItems()) |
| 70 , m_justifyItemsOverflowAlignment(RenderStyle::initialJustifyItemsOverflowAl
ignment()) | 64 , m_justifyItemsOverflowAlignment(RenderStyle::initialJustifyItemsOverflowAl
ignment()) |
| 71 , m_justifyItemsPositionType(RenderStyle::initialJustifyItemsPositionType()) | 65 , m_justifyItemsPositionType(RenderStyle::initialJustifyItemsPositionType()) |
| 72 , m_justifySelf(RenderStyle::initialJustifySelf()) | 66 , m_justifySelf(RenderStyle::initialJustifySelf()) |
| 73 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig
nment()) | 67 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig
nment()) |
| 74 , m_scrollBehavior(RenderStyle::initialScrollBehavior()) | 68 , m_scrollBehavior(RenderStyle::initialScrollBehavior()) |
| 75 , m_requiresAcceleratedCompositingForExternalReasons(false) | 69 , m_requiresAcceleratedCompositingForExternalReasons(false) |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 , m_alignItems(o.m_alignItems) | 102 , m_alignItems(o.m_alignItems) |
| 109 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) | 103 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) |
| 110 , m_alignSelf(o.m_alignSelf) | 104 , m_alignSelf(o.m_alignSelf) |
| 111 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment) | 105 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment) |
| 112 , m_justifyContent(o.m_justifyContent) | 106 , m_justifyContent(o.m_justifyContent) |
| 113 , userDrag(o.userDrag) | 107 , userDrag(o.userDrag) |
| 114 , textOverflow(o.textOverflow) | 108 , textOverflow(o.textOverflow) |
| 115 , m_textDecorationStyle(o.m_textDecorationStyle) | 109 , m_textDecorationStyle(o.m_textDecorationStyle) |
| 116 , m_wrapFlow(o.m_wrapFlow) | 110 , m_wrapFlow(o.m_wrapFlow) |
| 117 , m_wrapThrough(o.m_wrapThrough) | 111 , m_wrapThrough(o.m_wrapThrough) |
| 118 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation) | |
| 119 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation) | |
| 120 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation) | |
| 121 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi
tor) | |
| 122 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom
positor) | |
| 123 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito
r) | |
| 124 , m_hasAspectRatio(o.m_hasAspectRatio) | 112 , m_hasAspectRatio(o.m_hasAspectRatio) |
| 125 , m_touchAction(o.m_touchAction) | 113 , m_touchAction(o.m_touchAction) |
| 126 , m_objectFit(o.m_objectFit) | 114 , m_objectFit(o.m_objectFit) |
| 127 , m_justifyItems(o.m_justifyItems) | 115 , m_justifyItems(o.m_justifyItems) |
| 128 , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment) | 116 , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment) |
| 129 , m_justifyItemsPositionType(o.m_justifyItemsPositionType) | 117 , m_justifyItemsPositionType(o.m_justifyItemsPositionType) |
| 130 , m_justifySelf(o.m_justifySelf) | 118 , m_justifySelf(o.m_justifySelf) |
| 131 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) | 119 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) |
| 132 , m_scrollBehavior(o.m_scrollBehavior) | 120 , m_scrollBehavior(o.m_scrollBehavior) |
| 133 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated
CompositingForExternalReasons) | 121 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated
CompositingForExternalReasons) |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 && m_alignItems == o.m_alignItems | 157 && m_alignItems == o.m_alignItems |
| 170 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment | 158 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment |
| 171 && m_alignSelf == o.m_alignSelf | 159 && m_alignSelf == o.m_alignSelf |
| 172 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment | 160 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment |
| 173 && m_justifyContent == o.m_justifyContent | 161 && m_justifyContent == o.m_justifyContent |
| 174 && userDrag == o.userDrag | 162 && userDrag == o.userDrag |
| 175 && textOverflow == o.textOverflow | 163 && textOverflow == o.textOverflow |
| 176 && m_textDecorationStyle == o.m_textDecorationStyle | 164 && m_textDecorationStyle == o.m_textDecorationStyle |
| 177 && m_wrapFlow == o.m_wrapFlow | 165 && m_wrapFlow == o.m_wrapFlow |
| 178 && m_wrapThrough == o.m_wrapThrough | 166 && m_wrapThrough == o.m_wrapThrough |
| 179 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation | |
| 180 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation | |
| 181 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation | |
| 182 && m_hasAspectRatio == o.m_hasAspectRatio | 167 && m_hasAspectRatio == o.m_hasAspectRatio |
| 183 && m_touchAction == o.m_touchAction | 168 && m_touchAction == o.m_touchAction |
| 184 && m_objectFit == o.m_objectFit | 169 && m_objectFit == o.m_objectFit |
| 185 && m_justifyItems == o.m_justifyItems | 170 && m_justifyItems == o.m_justifyItems |
| 186 && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment | 171 && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment |
| 187 && m_justifyItemsPositionType == o.m_justifyItemsPositionType | 172 && m_justifyItemsPositionType == o.m_justifyItemsPositionType |
| 188 && m_justifySelf == o.m_justifySelf | 173 && m_justifySelf == o.m_justifySelf |
| 189 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment | 174 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment |
| 190 && m_scrollBehavior == o.m_scrollBehavior | 175 && m_scrollBehavior == o.m_scrollBehavior |
| 191 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc
eleratedCompositingForExternalReasons | 176 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc
eleratedCompositingForExternalReasons |
| (...skipping 27 matching lines...) Expand all Loading... |
| 219 return false; | 204 return false; |
| 220 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); | 205 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); |
| 221 } | 206 } |
| 222 | 207 |
| 223 bool StyleRareNonInheritedData::hasFilters() const | 208 bool StyleRareNonInheritedData::hasFilters() const |
| 224 { | 209 { |
| 225 return m_filter.get() && !m_filter->m_operations.isEmpty(); | 210 return m_filter.get() && !m_filter->m_operations.isEmpty(); |
| 226 } | 211 } |
| 227 | 212 |
| 228 } // namespace blink | 213 } // namespace blink |
| OLD | NEW |