| 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 2464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2475 | 2475 |
| 2476 if (!layerBeingDestroyed && m_groupedMapping) { | 2476 if (!layerBeingDestroyed && m_groupedMapping) { |
| 2477 m_groupedMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree
); | 2477 m_groupedMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree
); |
| 2478 m_groupedMapping->removeRenderLayerFromSquashingGraphicsLayer(this); | 2478 m_groupedMapping->removeRenderLayerFromSquashingGraphicsLayer(this); |
| 2479 } | 2479 } |
| 2480 m_groupedMapping = groupedMapping; | 2480 m_groupedMapping = groupedMapping; |
| 2481 if (!layerBeingDestroyed && m_groupedMapping) | 2481 if (!layerBeingDestroyed && m_groupedMapping) |
| 2482 m_groupedMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree
); | 2482 m_groupedMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree
); |
| 2483 } | 2483 } |
| 2484 | 2484 |
| 2485 void RenderLayer::unbindAnimatedProperties() |
| 2486 { |
| 2487 ASSERT(isAllowedToQueryCompositingState()); |
| 2488 if (m_compositedLayerMapping) |
| 2489 m_compositedLayerMapping->unbindAnimatedProperties(); |
| 2490 } |
| 2491 |
| 2492 void RenderLayer::bindAnimatedProperties(const Vector<String>& properties) |
| 2493 { |
| 2494 ASSERT(isAllowedToQueryCompositingState()); |
| 2495 if (m_compositedLayerMapping) |
| 2496 m_compositedLayerMapping->bindAnimatedProperties(properties); |
| 2497 } |
| 2498 |
| 2485 bool RenderLayer::hasCompositedMask() const | 2499 bool RenderLayer::hasCompositedMask() const |
| 2486 { | 2500 { |
| 2487 return m_compositedLayerMapping && m_compositedLayerMapping->hasMaskLayer(); | 2501 return m_compositedLayerMapping && m_compositedLayerMapping->hasMaskLayer(); |
| 2488 } | 2502 } |
| 2489 | 2503 |
| 2490 bool RenderLayer::hasCompositedClippingMask() const | 2504 bool RenderLayer::hasCompositedClippingMask() const |
| 2491 { | 2505 { |
| 2492 return m_compositedLayerMapping && m_compositedLayerMapping->hasChildClippin
gMaskLayer(); | 2506 return m_compositedLayerMapping && m_compositedLayerMapping->hasChildClippin
gMaskLayer(); |
| 2493 } | 2507 } |
| 2494 | 2508 |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2870 } | 2884 } |
| 2871 } | 2885 } |
| 2872 | 2886 |
| 2873 void showLayerTree(const blink::RenderObject* renderer) | 2887 void showLayerTree(const blink::RenderObject* renderer) |
| 2874 { | 2888 { |
| 2875 if (!renderer) | 2889 if (!renderer) |
| 2876 return; | 2890 return; |
| 2877 showLayerTree(renderer->enclosingLayer()); | 2891 showLayerTree(renderer->enclosingLayer()); |
| 2878 } | 2892 } |
| 2879 #endif | 2893 #endif |
| OLD | NEW |