OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
7 * Copyright (C) 2010, 2012 Google Inc. All rights reserved. | 7 * Copyright (C) 2010, 2012 Google Inc. All rights reserved. |
8 * | 8 * |
9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 setChildNeedsLayout(); | 132 setChildNeedsLayout(); |
133 createLayer(type); | 133 createLayer(type); |
134 if (parent() && !needsLayout() && containingBlock()) { | 134 if (parent() && !needsLayout() && containingBlock()) { |
135 // FIXME: This invalidation is overly broad. We should update to | 135 // FIXME: This invalidation is overly broad. We should update to |
136 // do the correct invalidation at RenderStyle::diff time. crbug.
com/349061 | 136 // do the correct invalidation at RenderStyle::diff time. crbug.
com/349061 |
137 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) | 137 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) |
138 layer()->renderer()->setShouldDoFullPaintInvalidationAfterLa
yout(true); | 138 layer()->renderer()->setShouldDoFullPaintInvalidationAfterLa
yout(true); |
139 else | 139 else |
140 layer()->repainter().setRepaintStatus(NeedsFullRepaint); | 140 layer()->repainter().setRepaintStatus(NeedsFullRepaint); |
141 // Hit in animations/interpolation/perspective-interpolation.htm
l | 141 // Hit in animations/interpolation/perspective-interpolation.htm
l |
| 142 // FIXME: I suspect we can remove this assert disabler now. |
142 DisableCompositingQueryAsserts disabler; | 143 DisableCompositingQueryAsserts disabler; |
143 // There is only one layer to update, it is not worth using |cac
hedOffset| since | 144 layer()->updateLayerPositionRecursive(); |
144 // we are not sure the value will be used. | |
145 layer()->updateLayerPositionRecursive(0); | |
146 } | 145 } |
147 } | 146 } |
148 } else if (layer() && layer()->parent()) { | 147 } else if (layer() && layer()->parent()) { |
149 setHasTransform(false); // Either a transform wasn't specified or the ob
ject doesn't support transforms, so just null out the bit. | 148 setHasTransform(false); // Either a transform wasn't specified or the ob
ject doesn't support transforms, so just null out the bit. |
150 setHasReflection(false); | 149 setHasReflection(false); |
151 layer()->removeOnlyThisLayer(); // calls destroyLayer() which clears m_l
ayer | 150 layer()->removeOnlyThisLayer(); // calls destroyLayer() which clears m_l
ayer |
152 if (s_wasFloating && isFloating()) | 151 if (s_wasFloating && isFloating()) |
153 setChildNeedsLayout(); | 152 setChildNeedsLayout(); |
154 if (hadTransform) | 153 if (hadTransform) |
155 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); | 154 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 return m_layer ? m_layer->hasCompositedLayerMapping() : false; | 201 return m_layer ? m_layer->hasCompositedLayerMapping() : false; |
203 } | 202 } |
204 | 203 |
205 CompositedLayerMapping* RenderLayerModelObject::groupedMapping() const | 204 CompositedLayerMapping* RenderLayerModelObject::groupedMapping() const |
206 { | 205 { |
207 return m_layer ? m_layer->groupedMapping() : 0; | 206 return m_layer ? m_layer->groupedMapping() : 0; |
208 } | 207 } |
209 | 208 |
210 } // namespace WebCore | 209 } // namespace WebCore |
211 | 210 |
OLD | NEW |