diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/rendering/RenderLayerBacking.h | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/rendering/RenderLayerBacking.h')
-rw-r--r-- | Source/WebCore/rendering/RenderLayerBacking.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderLayerBacking.h b/Source/WebCore/rendering/RenderLayerBacking.h index 8f0927d..f1b8972 100644 --- a/Source/WebCore/rendering/RenderLayerBacking.h +++ b/Source/WebCore/rendering/RenderLayerBacking.h @@ -69,7 +69,6 @@ public: // Update graphics layer position and bounds. void updateGraphicsLayerGeometry(); // make private // Update contents and clipping structure. - void updateInternalHierarchy(); // make private void updateDrawsContent(); GraphicsLayer* graphicsLayer() const { return m_graphicsLayer.get(); } @@ -139,6 +138,10 @@ public: void updateContentsScale(float); + GraphicsLayer* layerForHorizontalScrollbar() const { return m_layerForHorizontalScrollbar.get(); } + GraphicsLayer* layerForVerticalScrollbar() const { return m_layerForVerticalScrollbar.get(); } + GraphicsLayer* layerForScrollCorner() const { return m_layerForScrollCorner.get(); } + private: void createGraphicsLayer(); void destroyGraphicsLayer(); @@ -146,9 +149,14 @@ private: RenderBoxModelObject* renderer() const { return m_owningLayer->renderer(); } RenderLayerCompositor* compositor() const { return m_owningLayer->compositor(); } + void updateInternalHierarchy(); bool updateClippingLayers(bool needsAncestorClip, bool needsDescendantClip); + bool updateOverflowControlsLayers(bool needsHorizontalScrollbarLayer, bool needsVerticalScrollbarLayer, bool needsScrollCornerLayer); bool updateForegroundLayer(bool needsForegroundLayer); bool updateMaskLayer(bool needsMaskLayer); + bool requiresHorizontalScrollbarLayer() const; + bool requiresVerticalScrollbarLayer() const; + bool requiresScrollCornerLayer() const; GraphicsLayerPaintingPhase paintingPhaseForPrimaryLayer() const; @@ -196,6 +204,10 @@ private: OwnPtr<GraphicsLayer> m_clippingLayer; // only used if we have clipping on a stacking context, with compositing children OwnPtr<GraphicsLayer> m_maskLayer; // only used if we have a mask + OwnPtr<GraphicsLayer> m_layerForHorizontalScrollbar; + OwnPtr<GraphicsLayer> m_layerForVerticalScrollbar; + OwnPtr<GraphicsLayer> m_layerForScrollCorner; + IntRect m_compositedBounds; bool m_artificiallyInflatedBounds; // bounds had to be made non-zero to make transform-origin work |