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 3510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3521 | 3521 |
3522 CompositedLayerMappingPtr RenderLayer::compositedLayerMapping() const | 3522 CompositedLayerMappingPtr RenderLayer::compositedLayerMapping() const |
3523 { | 3523 { |
3524 ASSERT(isAllowedToQueryCompositingState()); | 3524 ASSERT(isAllowedToQueryCompositingState()); |
3525 return m_compositedLayerMapping.get(); | 3525 return m_compositedLayerMapping.get(); |
3526 } | 3526 } |
3527 | 3527 |
3528 CompositedLayerMappingPtr RenderLayer::ensureCompositedLayerMapping() | 3528 CompositedLayerMappingPtr RenderLayer::ensureCompositedLayerMapping() |
3529 { | 3529 { |
3530 if (!m_compositedLayerMapping) { | 3530 if (!m_compositedLayerMapping) { |
3531 m_compositedLayerMapping = adoptPtr(new CompositedLayerMapping(this)); | 3531 m_compositedLayerMapping = adoptPtr(new CompositedLayerMapping(*this)); |
3532 m_compositedLayerMapping->setNeedsGeometryUpdate(); | 3532 m_compositedLayerMapping->setNeedsGeometryUpdate(); |
3533 | 3533 |
3534 updateOrRemoveFilterEffectRenderer(); | 3534 updateOrRemoveFilterEffectRenderer(); |
3535 | 3535 |
3536 if (RuntimeEnabledFeatures::cssCompositingEnabled()) | 3536 if (RuntimeEnabledFeatures::cssCompositingEnabled()) |
3537 compositedLayerMapping()->setBlendMode(m_blendInfo.blendMode()); | 3537 compositedLayerMapping()->setBlendMode(m_blendInfo.blendMode()); |
3538 } | 3538 } |
3539 return m_compositedLayerMapping.get(); | 3539 return m_compositedLayerMapping.get(); |
3540 } | 3540 } |
3541 | 3541 |
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4067 } | 4067 } |
4068 } | 4068 } |
4069 | 4069 |
4070 void showLayerTree(const WebCore::RenderObject* renderer) | 4070 void showLayerTree(const WebCore::RenderObject* renderer) |
4071 { | 4071 { |
4072 if (!renderer) | 4072 if (!renderer) |
4073 return; | 4073 return; |
4074 showLayerTree(renderer->enclosingLayer()); | 4074 showLayerTree(renderer->enclosingLayer()); |
4075 } | 4075 } |
4076 #endif | 4076 #endif |
OLD | NEW |