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 2405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2416 switch (compositingState()) { | 2416 switch (compositingState()) { |
2417 case NotComposited: | 2417 case NotComposited: |
2418 return 0; | 2418 return 0; |
2419 case PaintsIntoGroupedBacking: | 2419 case PaintsIntoGroupedBacking: |
2420 return groupedMapping()->squashingLayer(); | 2420 return groupedMapping()->squashingLayer(); |
2421 default: | 2421 default: |
2422 return compositedLayerMapping()->scrollingContentsLayer() ? compositedLa
yerMapping()->scrollingContentsLayer() : compositedLayerMapping()->mainGraphicsL
ayer(); | 2422 return compositedLayerMapping()->scrollingContentsLayer() ? compositedLa
yerMapping()->scrollingContentsLayer() : compositedLayerMapping()->mainGraphicsL
ayer(); |
2423 } | 2423 } |
2424 } | 2424 } |
2425 | 2425 |
2426 CompositedLayerMapping* RenderLayer::ensureCompositedLayerMapping() | 2426 void RenderLayer::ensureCompositedLayerMapping() |
2427 { | 2427 { |
2428 if (!m_compositedLayerMapping) { | 2428 if (m_compositedLayerMapping) |
2429 m_compositedLayerMapping = adoptPtr(new CompositedLayerMapping(*this)); | 2429 return; |
2430 m_compositedLayerMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdat
eSubtree); | |
2431 | 2430 |
2432 updateOrRemoveFilterEffectRenderer(); | 2431 m_compositedLayerMapping = adoptPtr(new CompositedLayerMapping(*this)); |
2433 } | 2432 m_compositedLayerMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSub
tree); |
2434 return m_compositedLayerMapping.get(); | 2433 |
| 2434 updateOrRemoveFilterEffectRenderer(); |
2435 } | 2435 } |
2436 | 2436 |
2437 void RenderLayer::clearCompositedLayerMapping(bool layerBeingDestroyed) | 2437 void RenderLayer::clearCompositedLayerMapping(bool layerBeingDestroyed) |
2438 { | 2438 { |
2439 if (!layerBeingDestroyed) { | 2439 if (!layerBeingDestroyed) { |
2440 // We need to make sure our decendants get a geometry update. In princip
le, | 2440 // We need to make sure our decendants get a geometry update. In princip
le, |
2441 // we could call setNeedsGraphicsLayerUpdate on our children, but that w
ould | 2441 // we could call setNeedsGraphicsLayerUpdate on our children, but that w
ould |
2442 // require walking the z-order lists to find them. Instead, we over-inva
lidate | 2442 // require walking the z-order lists to find them. Instead, we over-inva
lidate |
2443 // by marking our parent as needing a geometry update. | 2443 // by marking our parent as needing a geometry update. |
2444 if (RenderLayer* compositingParent = enclosingLayerWithCompositedLayerMa
pping(ExcludeSelf)) | 2444 if (RenderLayer* compositingParent = enclosingLayerWithCompositedLayerMa
pping(ExcludeSelf)) |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2839 } | 2839 } |
2840 } | 2840 } |
2841 | 2841 |
2842 void showLayerTree(const blink::RenderObject* renderer) | 2842 void showLayerTree(const blink::RenderObject* renderer) |
2843 { | 2843 { |
2844 if (!renderer) | 2844 if (!renderer) |
2845 return; | 2845 return; |
2846 showLayerTree(renderer->enclosingLayer()); | 2846 showLayerTree(renderer->enclosingLayer()); |
2847 } | 2847 } |
2848 #endif | 2848 #endif |
OLD | NEW |