| Index: Source/core/rendering/compositing/CompositedLayerMapping.h
|
| diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.h b/Source/core/rendering/compositing/CompositedLayerMapping.h
|
| index c0d9a2a8e9f667b3e6d34559710514a810863775..e801a515d73a100cbb59e92211428c524602d257 100644
|
| --- a/Source/core/rendering/compositing/CompositedLayerMapping.h
|
| +++ b/Source/core/rendering/compositing/CompositedLayerMapping.h
|
| @@ -191,7 +191,6 @@ public:
|
| #endif
|
|
|
| LayoutRect contentsBox() const;
|
| - IntRect backgroundBox() const;
|
|
|
| // For informative purposes only.
|
| CompositingLayerType compositingLayerType() const;
|
| @@ -233,7 +232,7 @@ private:
|
| void updateScrollParent(RenderLayer*);
|
| void updateClipParent(RenderLayer*);
|
| bool updateSquashingLayers(bool needsSquashingLayers);
|
| - void updateDrawsContent(bool isSimpleContainer);
|
| + void updateDrawsContent();
|
| void updateChildrenTransform();
|
| void registerScrollingLayers();
|
|
|
| @@ -260,20 +259,18 @@ private:
|
|
|
| bool isMainFrameRenderViewLayer() const;
|
|
|
| - bool paintsBoxDecorations() const;
|
| bool paintsChildren() const;
|
|
|
| - // Returns true if this compositing layer has no visible content.
|
| - bool isSimpleContainerCompositingLayer() const;
|
| // Returns true if this layer has content that needs to be rendered by painting into the backing store.
|
| - bool containsPaintedContent(bool isSimpleContainer) const;
|
| + bool containsPaintedContent() const;
|
| + bool hasVisibleContentOrNonCompositingDescendantLayers() const;
|
| // Returns true if the RenderLayer just contains an image that we can composite directly.
|
| bool isDirectlyCompositedImage() const;
|
| void updateImageContents();
|
|
|
| Color rendererBackgroundColor() const;
|
| - void updateBackgroundColor(bool isSimpleContainer);
|
| - void updateContentsRect(bool isSimpleContainer);
|
| + void updateBackgroundColor();
|
| + void updateContentsRect();
|
|
|
| void updateCompositingReasons();
|
|
|
|
|