| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 LayerType type = layerTypeRequired(); | 119 LayerType type = layerTypeRequired(); |
| 120 if (type != NoLayer) { | 120 if (type != NoLayer) { |
| 121 if (!layer() && layerCreationAllowedForSubtree()) { | 121 if (!layer() && layerCreationAllowedForSubtree()) { |
| 122 if (s_wasFloating && isFloating()) | 122 if (s_wasFloating && isFloating()) |
| 123 setChildNeedsLayout(); | 123 setChildNeedsLayout(); |
| 124 createLayer(type); | 124 createLayer(type); |
| 125 if (parent() && !needsLayout()) { | 125 if (parent() && !needsLayout()) { |
| 126 // FIXME: This invalidation is overly broad. We should update to | 126 // FIXME: This invalidation is overly broad. We should update to |
| 127 // do the correct invalidation at RenderStyle::diff time. crbug.
com/349061 | 127 // do the correct invalidation at RenderStyle::diff time. crbug.
com/349061 |
| 128 layer()->renderer()->setShouldDoFullPaintInvalidation(true); | 128 layer()->renderer()->setShouldDoFullPaintInvalidation(true); |
| 129 // Hit in animations/interpolation/perspective-interpolation.htm
l | 129 // FIXME: We should call a specialized version of this function. |
| 130 // FIXME: I suspect we can remove this assert disabler now. | 130 layer()->updateLayerPositionsAfterLayout(); |
| 131 DisableCompositingQueryAsserts disabler; | |
| 132 layer()->updateLayerPositionRecursive(); | |
| 133 } | 131 } |
| 134 } | 132 } |
| 135 } else if (layer() && layer()->parent()) { | 133 } else if (layer() && layer()->parent()) { |
| 136 setHasTransform(false); // Either a transform wasn't specified or the ob
ject doesn't support transforms, so just null out the bit. | 134 setHasTransform(false); // Either a transform wasn't specified or the ob
ject doesn't support transforms, so just null out the bit. |
| 137 setHasReflection(false); | 135 setHasReflection(false); |
| 138 layer()->removeOnlyThisLayer(); // calls destroyLayer() which clears m_l
ayer | 136 layer()->removeOnlyThisLayer(); // calls destroyLayer() which clears m_l
ayer |
| 139 if (s_wasFloating && isFloating()) | 137 if (s_wasFloating && isFloating()) |
| 140 setChildNeedsLayout(); | 138 setChildNeedsLayout(); |
| 141 if (hadTransform) | 139 if (hadTransform) |
| 142 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); | 140 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 // savings. | 172 // savings. |
| 175 layer()->addLayerHitTestRects(rects); | 173 layer()->addLayerHitTestRects(rects); |
| 176 } | 174 } |
| 177 } else { | 175 } else { |
| 178 RenderObject::addLayerHitTestRects(rects, currentLayer, layerOffset, con
tainerRect); | 176 RenderObject::addLayerHitTestRects(rects, currentLayer, layerOffset, con
tainerRect); |
| 179 } | 177 } |
| 180 } | 178 } |
| 181 | 179 |
| 182 } // namespace blink | 180 } // namespace blink |
| 183 | 181 |
| OLD | NEW |