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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 layer()->updateLayerPositionRecursive(0, 0); | 145 layer()->updateLayerPositionRecursive(0, 0); |
146 } | 146 } |
147 } | 147 } |
148 } else if (layer() && layer()->parent()) { | 148 } 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. | 149 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); | 150 setHasReflection(false); |
151 layer()->removeOnlyThisLayer(); // calls destroyLayer() which clears m_l
ayer | 151 layer()->removeOnlyThisLayer(); // calls destroyLayer() which clears m_l
ayer |
152 if (s_wasFloating && isFloating()) | 152 if (s_wasFloating && isFloating()) |
153 setChildNeedsLayout(); | 153 setChildNeedsLayout(); |
154 if (hadTransform) | 154 if (hadTransform) |
155 setNeedsLayoutAndPrefWidthsRecalcAndFullRepaint(); | 155 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
156 } | 156 } |
157 | 157 |
158 if (layer()) { | 158 if (layer()) { |
159 // FIXME: Ideally we shouldn't need this setter but we can't easily infe
r an overflow-only layer | 159 // FIXME: Ideally we shouldn't need this setter but we can't easily infe
r an overflow-only layer |
160 // from the style. | 160 // from the style. |
161 layer()->setLayerType(type); | 161 layer()->setLayerType(type); |
162 layer()->styleChanged(diff, oldStyle); | 162 layer()->styleChanged(diff, oldStyle); |
163 } | 163 } |
164 | 164 |
165 if (FrameView *frameView = view()->frameView()) { | 165 if (FrameView *frameView = view()->frameView()) { |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 return m_layer ? m_layer->hasCompositedLayerMapping() : false; | 202 return m_layer ? m_layer->hasCompositedLayerMapping() : false; |
203 } | 203 } |
204 | 204 |
205 CompositedLayerMapping* RenderLayerModelObject::groupedMapping() const | 205 CompositedLayerMapping* RenderLayerModelObject::groupedMapping() const |
206 { | 206 { |
207 return m_layer ? m_layer->groupedMapping() : 0; | 207 return m_layer ? m_layer->groupedMapping() : 0; |
208 } | 208 } |
209 | 209 |
210 } // namespace WebCore | 210 } // namespace WebCore |
211 | 211 |
OLD | NEW |