Chromium Code Reviews| Index: Source/core/rendering/RenderLayer.h |
| diff --git a/Source/core/rendering/RenderLayer.h b/Source/core/rendering/RenderLayer.h |
| index d48d8448369f91a96d0105e4565930c5643759d3..a63d597e1d4d4f278d8868cffd192cf099cfa4d9 100644 |
| --- a/Source/core/rendering/RenderLayer.h |
| +++ b/Source/core/rendering/RenderLayer.h |
| @@ -45,6 +45,7 @@ |
| #ifndef RenderLayer_h |
| #define RenderLayer_h |
| +#include "core/rendering/CompositedLayerMappingPtr.h" |
| #include "core/rendering/CompositingReasons.h" |
| #include "core/rendering/LayerPaintingInfo.h" |
| #include "core/rendering/PaintInfo.h" |
| @@ -347,8 +348,9 @@ public: |
| // NOTE: If you are accessing the CompositedLayerMapping as a boolean condition to determine the state of compositing for this layer, |
| // then you may have incorrect logic. Use compositingState() instead. |
| - CompositedLayerMapping* compositedLayerMapping() const { return m_compositedLayerMapping.get(); } |
| - CompositedLayerMapping* ensureCompositedLayerMapping(); |
| + CompositedLayerMappingPtr compositedLayerMapping() const { return m_compositedLayerMapping.get(); } |
| + CompositedLayerMappingPtr ensureCompositedLayerMapping(); |
| + bool hasCompositedLayerMapping() const { return m_compositedLayerMapping.get(); } |
|
shawnsingh
2013/11/12 09:55:50
I think the NOTE 3 lines above should apply to thi
Ian Vollick
2013/11/14 04:12:47
They have been moved in the hasCLM patch.
|
| void clearCompositedLayerMapping(bool layerBeingDestroyed = false); |
| bool hasCompositedMask() const; |