OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. |
3 * | 3 * |
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
5 * | 5 * |
6 * Other contributors: | 6 * Other contributors: |
7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 compositor()->removeOutOfFlowPositionedLayer(this); | 158 compositor()->removeOutOfFlowPositionedLayer(this); |
159 | 159 |
160 if (renderer()->frame() && renderer()->frame()->page()) { | 160 if (renderer()->frame() && renderer()->frame()->page()) { |
161 if (ScrollingCoordinator* scrollingCoordinator = renderer()->frame()->pa
ge()->scrollingCoordinator()) | 161 if (ScrollingCoordinator* scrollingCoordinator = renderer()->frame()->pa
ge()->scrollingCoordinator()) |
162 scrollingCoordinator->willDestroyRenderLayer(this); | 162 scrollingCoordinator->willDestroyRenderLayer(this); |
163 } | 163 } |
164 | 164 |
165 removeFilterInfoIfNeeded(); | 165 removeFilterInfoIfNeeded(); |
166 | 166 |
167 if (groupedMapping()) { | 167 if (groupedMapping()) { |
| 168 DisableCompositingQueryAsserts disabler; |
168 groupedMapping()->removeRenderLayerFromSquashingGraphicsLayer(this); | 169 groupedMapping()->removeRenderLayerFromSquashingGraphicsLayer(this); |
169 setGroupedMapping(0); | 170 setGroupedMapping(0); |
170 } | 171 } |
171 | 172 |
172 // Child layers will be deleted by their corresponding render objects, so | 173 // Child layers will be deleted by their corresponding render objects, so |
173 // we don't need to delete them ourselves. | 174 // we don't need to delete them ourselves. |
174 | 175 |
175 clearCompositedLayerMapping(true); | 176 clearCompositedLayerMapping(true); |
176 } | 177 } |
177 | 178 |
(...skipping 3371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3549 if (RenderLayer* compositingParent = enclosingCompositingLayer(ExcludeSe
lf)) | 3550 if (RenderLayer* compositingParent = enclosingCompositingLayer(ExcludeSe
lf)) |
3550 compositingParent->compositedLayerMapping()->setNeedsGeometryUpdate(
); | 3551 compositingParent->compositedLayerMapping()->setNeedsGeometryUpdate(
); |
3551 } | 3552 } |
3552 | 3553 |
3553 m_compositedLayerMapping.clear(); | 3554 m_compositedLayerMapping.clear(); |
3554 | 3555 |
3555 if (!layerBeingDestroyed) | 3556 if (!layerBeingDestroyed) |
3556 updateOrRemoveFilterEffectRenderer(); | 3557 updateOrRemoveFilterEffectRenderer(); |
3557 } | 3558 } |
3558 | 3559 |
| 3560 void RenderLayer::setGroupedMapping(CompositedLayerMapping* groupedMapping, bool
layerBeingDestroyed) |
| 3561 { |
| 3562 if (!layerBeingDestroyed && m_groupedMapping) |
| 3563 m_groupedMapping->setNeedsGeometryUpdate(); |
| 3564 m_groupedMapping = groupedMapping; |
| 3565 if (!layerBeingDestroyed && m_groupedMapping) |
| 3566 m_groupedMapping->setNeedsGeometryUpdate(); |
| 3567 } |
| 3568 |
3559 bool RenderLayer::hasCompositedMask() const | 3569 bool RenderLayer::hasCompositedMask() const |
3560 { | 3570 { |
3561 return m_compositedLayerMapping && m_compositedLayerMapping->hasMaskLayer(); | 3571 return m_compositedLayerMapping && m_compositedLayerMapping->hasMaskLayer(); |
3562 } | 3572 } |
3563 | 3573 |
3564 bool RenderLayer::hasCompositedClippingMask() const | 3574 bool RenderLayer::hasCompositedClippingMask() const |
3565 { | 3575 { |
3566 return m_compositedLayerMapping && m_compositedLayerMapping->hasChildClippin
gMaskLayer(); | 3576 return m_compositedLayerMapping && m_compositedLayerMapping->hasChildClippin
gMaskLayer(); |
3567 } | 3577 } |
3568 | 3578 |
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4063 } | 4073 } |
4064 } | 4074 } |
4065 | 4075 |
4066 void showLayerTree(const WebCore::RenderObject* renderer) | 4076 void showLayerTree(const WebCore::RenderObject* renderer) |
4067 { | 4077 { |
4068 if (!renderer) | 4078 if (!renderer) |
4069 return; | 4079 return; |
4070 showLayerTree(renderer->enclosingLayer()); | 4080 showLayerTree(renderer->enclosingLayer()); |
4071 } | 4081 } |
4072 #endif | 4082 #endif |
OLD | NEW |