| 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 if (s_wasFloating && isFloating()) | 150 if (s_wasFloating && isFloating()) |
| 151 setChildNeedsLayout(); | 151 setChildNeedsLayout(); |
| 152 createLayer(type); | 152 createLayer(type); |
| 153 if (parent() && !needsLayout() && containingBlock()) { | 153 if (parent() && !needsLayout() && containingBlock()) { |
| 154 // FIXME: This invalidation is overly broad. We should update to | 154 // FIXME: This invalidation is overly broad. We should update to |
| 155 // do the correct invalidation at RenderStyle::diff time. crbug.
com/349061 | 155 // do the correct invalidation at RenderStyle::diff time. crbug.
com/349061 |
| 156 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) | 156 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) |
| 157 layer()->renderer()->setShouldDoFullRepaintAfterLayout(true)
; | 157 layer()->renderer()->setShouldDoFullRepaintAfterLayout(true)
; |
| 158 else | 158 else |
| 159 layer()->repainter().setRepaintStatus(NeedsFullRepaint); | 159 layer()->repainter().setRepaintStatus(NeedsFullRepaint); |
| 160 // Hit in animations/interpolation/perspective-interpolation.htm
l |
| 161 DisableCompositingQueryAsserts disabler; |
| 160 // There is only one layer to update, it is not worth using |cac
hedOffset| since | 162 // There is only one layer to update, it is not worth using |cac
hedOffset| since |
| 161 // we are not sure the value will be used. | 163 // we are not sure the value will be used. |
| 162 layer()->updateLayerPositions(0); | 164 layer()->updateLayerPositions(0); |
| 163 } | 165 } |
| 164 } | 166 } |
| 165 } else if (layer() && layer()->parent()) { | 167 } else if (layer() && layer()->parent()) { |
| 166 setHasTransform(false); // Either a transform wasn't specified or the ob
ject doesn't support transforms, so just null out the bit. | 168 setHasTransform(false); // Either a transform wasn't specified or the ob
ject doesn't support transforms, so just null out the bit. |
| 167 setHasReflection(false); | 169 setHasReflection(false); |
| 168 layer()->removeOnlyThisLayer(); // calls destroyLayer() which clears m_l
ayer | 170 layer()->removeOnlyThisLayer(); // calls destroyLayer() which clears m_l
ayer |
| 169 if (s_wasFloating && isFloating()) | 171 if (s_wasFloating && isFloating()) |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 return m_layer ? m_layer->hasCompositedLayerMapping() : false; | 224 return m_layer ? m_layer->hasCompositedLayerMapping() : false; |
| 223 } | 225 } |
| 224 | 226 |
| 225 CompositedLayerMapping* RenderLayerModelObject::groupedMapping() const | 227 CompositedLayerMapping* RenderLayerModelObject::groupedMapping() const |
| 226 { | 228 { |
| 227 return m_layer ? m_layer->groupedMapping() : 0; | 229 return m_layer ? m_layer->groupedMapping() : 0; |
| 228 } | 230 } |
| 229 | 231 |
| 230 } // namespace WebCore | 232 } // namespace WebCore |
| 231 | 233 |
| OLD | NEW |