OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> |
3 * Copyright (C) 2004, 2005, 2007, 2008 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2007, 2008 Rob Buis <buis@kde.org> |
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> | 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> |
5 * Copyright (C) 2009 Google, Inc. All rights reserved. | 5 * Copyright (C) 2009 Google, Inc. All rights reserved. |
6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> | 6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 return SVGLayoutSupport::hasFilterResource(*this); | 104 return SVGLayoutSupport::hasFilterResource(*this); |
105 } | 105 } |
106 | 106 |
107 void LayoutSVGContainer::styleDidChange(StyleDifference diff, | 107 void LayoutSVGContainer::styleDidChange(StyleDifference diff, |
108 const ComputedStyle* oldStyle) { | 108 const ComputedStyle* oldStyle) { |
109 LayoutSVGModelObject::styleDidChange(diff, oldStyle); | 109 LayoutSVGModelObject::styleDidChange(diff, oldStyle); |
110 | 110 |
111 bool hadIsolation = | 111 bool hadIsolation = |
112 oldStyle && !isSVGHiddenContainer() && | 112 oldStyle && !isSVGHiddenContainer() && |
113 SVGLayoutSupport::willIsolateBlendingDescendantsForStyle(*oldStyle); | 113 SVGLayoutSupport::willIsolateBlendingDescendantsForStyle(*oldStyle); |
114 bool isolationChanged = | 114 |
115 hadIsolation == | 115 bool willIsolateBlendingDescendants = |
116 !SVGLayoutSupport::willIsolateBlendingDescendantsForObject(this); | 116 SVGLayoutSupport::willIsolateBlendingDescendantsForObject(this); |
| 117 |
| 118 bool isolationChanged = hadIsolation != willIsolateBlendingDescendants; |
| 119 |
| 120 if (isolationChanged) |
| 121 setNeedsPaintPropertyUpdate(); |
117 | 122 |
118 if (!parent() || !isolationChanged) | 123 if (!parent() || !isolationChanged) |
119 return; | 124 return; |
120 | 125 |
121 if (hasNonIsolatedBlendingDescendants()) | 126 if (hasNonIsolatedBlendingDescendants()) { |
122 parent()->descendantIsolationRequirementsChanged( | 127 parent()->descendantIsolationRequirementsChanged( |
123 SVGLayoutSupport::willIsolateBlendingDescendantsForObject(this) | 128 willIsolateBlendingDescendants ? DescendantIsolationNeedsUpdate |
124 ? DescendantIsolationNeedsUpdate | 129 : DescendantIsolationRequired); |
125 : DescendantIsolationRequired); | 130 } |
126 } | 131 } |
127 | 132 |
128 bool LayoutSVGContainer::hasNonIsolatedBlendingDescendants() const { | 133 bool LayoutSVGContainer::hasNonIsolatedBlendingDescendants() const { |
129 if (m_hasNonIsolatedBlendingDescendantsDirty) { | 134 if (m_hasNonIsolatedBlendingDescendantsDirty) { |
130 m_hasNonIsolatedBlendingDescendants = | 135 m_hasNonIsolatedBlendingDescendants = |
131 SVGLayoutSupport::computeHasNonIsolatedBlendingDescendants(this); | 136 SVGLayoutSupport::computeHasNonIsolatedBlendingDescendants(this); |
132 m_hasNonIsolatedBlendingDescendantsDirty = false; | 137 m_hasNonIsolatedBlendingDescendantsDirty = false; |
133 } | 138 } |
134 return m_hasNonIsolatedBlendingDescendants; | 139 return m_hasNonIsolatedBlendingDescendants; |
135 } | 140 } |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 // under the pointer (i.e., there is no target element), the event is not | 218 // under the pointer (i.e., there is no target element), the event is not |
214 // dispatched." | 219 // dispatched." |
215 return false; | 220 return false; |
216 } | 221 } |
217 | 222 |
218 SVGTransformChange LayoutSVGContainer::calculateLocalTransform() { | 223 SVGTransformChange LayoutSVGContainer::calculateLocalTransform() { |
219 return SVGTransformChange::None; | 224 return SVGTransformChange::None; |
220 } | 225 } |
221 | 226 |
222 } // namespace blink | 227 } // namespace blink |
OLD | NEW |