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 3538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3549 if (RenderLayer* compositingParent = enclosingCompositingLayer(ExcludeSe lf)) | 3549 if (RenderLayer* compositingParent = enclosingCompositingLayer(ExcludeSe lf)) |
3550 compositingParent->compositedLayerMapping()->setNeedsGeometryUpdate( ); | 3550 compositingParent->compositedLayerMapping()->setNeedsGeometryUpdate( ); |
3551 } | 3551 } |
3552 | 3552 |
3553 m_compositedLayerMapping.clear(); | 3553 m_compositedLayerMapping.clear(); |
3554 | 3554 |
3555 if (!layerBeingDestroyed) | 3555 if (!layerBeingDestroyed) |
3556 updateOrRemoveFilterEffectRenderer(); | 3556 updateOrRemoveFilterEffectRenderer(); |
3557 } | 3557 } |
3558 | 3558 |
3559 void RenderLayer::setGroupedMapping(CompositedLayerMapping* groupedMapping, bool layerBeingDestroyed) | |
3560 { | |
3561 if (!layerBeingDestroyed && m_groupedMapping) | |
ojan
2014/03/19 18:54:00
Nit, can this be one if statement?
if (!layerBein
chrishtr
2014/03/19 19:27:42
It could, but then it would have to have two lines
| |
3562 m_groupedMapping->setNeedsGeometryUpdate(); | |
3563 m_groupedMapping = groupedMapping; | |
3564 if (!layerBeingDestroyed && m_groupedMapping) | |
3565 m_groupedMapping->setNeedsGeometryUpdate(); | |
3566 } | |
3567 | |
3559 bool RenderLayer::hasCompositedMask() const | 3568 bool RenderLayer::hasCompositedMask() const |
3560 { | 3569 { |
3561 return m_compositedLayerMapping && m_compositedLayerMapping->hasMaskLayer(); | 3570 return m_compositedLayerMapping && m_compositedLayerMapping->hasMaskLayer(); |
3562 } | 3571 } |
3563 | 3572 |
3564 bool RenderLayer::hasCompositedClippingMask() const | 3573 bool RenderLayer::hasCompositedClippingMask() const |
3565 { | 3574 { |
3566 return m_compositedLayerMapping && m_compositedLayerMapping->hasChildClippin gMaskLayer(); | 3575 return m_compositedLayerMapping && m_compositedLayerMapping->hasChildClippin gMaskLayer(); |
3567 } | 3576 } |
3568 | 3577 |
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4063 } | 4072 } |
4064 } | 4073 } |
4065 | 4074 |
4066 void showLayerTree(const WebCore::RenderObject* renderer) | 4075 void showLayerTree(const WebCore::RenderObject* renderer) |
4067 { | 4076 { |
4068 if (!renderer) | 4077 if (!renderer) |
4069 return; | 4078 return; |
4070 showLayerTree(renderer->enclosingLayer()); | 4079 showLayerTree(renderer->enclosingLayer()); |
4071 } | 4080 } |
4072 #endif | 4081 #endif |
OLD | NEW |