From 5ef7c8a6a70875d4430752d146bdcb069605d71d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 21 Aug 2012 10:57:44 +0200 Subject: Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147) New snapshot including various build fixes for newer Qt 5 --- Source/WebCore/rendering/RenderLayer.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Source/WebCore/rendering/RenderLayer.h') diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h index dd6df15a1..00c5c19d2 100644 --- a/Source/WebCore/rendering/RenderLayer.h +++ b/Source/WebCore/rendering/RenderLayer.h @@ -397,6 +397,10 @@ public: bool isPaginated() const { return m_isPaginated; } void updateTransform(); + +#if ENABLE(CSS_COMPOSITING) + void updateBlendMode(); +#endif const LayoutSize& relativePositionOffset() const { return m_relativeOffset; } @@ -710,13 +714,13 @@ private: void updateCompositingAndLayerListsIfNeeded(); - void paintLayer(RenderLayer* rootLayer, GraphicsContext*, const LayoutRect& paintDirtyRect, + void paintLayer(RenderLayer* rootLayer, GraphicsContext*, const LayoutRect& paintDirtyRect, const LayoutSize& subPixelAccumulation, PaintBehavior, RenderObject* paintingRoot, RenderRegion* = 0, OverlapTestRequestMap* = 0, PaintLayerFlags = 0); - void paintLayerContentsAndReflection(RenderLayer* rootLayer, GraphicsContext*, const LayoutRect& paintDirtyRect, + void paintLayerContentsAndReflection(RenderLayer* rootLayer, GraphicsContext*, const LayoutRect& paintDirtyRect, const LayoutSize& subPixelAccumulation, PaintBehavior, RenderObject* paintingRoot, RenderRegion* = 0, OverlapTestRequestMap* = 0, PaintLayerFlags = 0); - void paintLayerContents(RenderLayer* rootLayer, GraphicsContext*, const LayoutRect& paintDirtyRect, + void paintLayerContents(RenderLayer* rootLayer, GraphicsContext*, const LayoutRect& paintDirtyRect, const LayoutSize& subPixelAccumulation, PaintBehavior, RenderObject* paintingRoot, RenderRegion* = 0, OverlapTestRequestMap* = 0, PaintLayerFlags = 0); void paintList(Vector*, RenderLayer* rootLayer, GraphicsContext* p, @@ -931,6 +935,10 @@ protected: bool m_hasFilterInfo : 1; #endif +#if ENABLE(CSS_COMPOSITING) + BlendMode m_blendMode; +#endif + RenderBoxModelObject* m_renderer; RenderLayer* m_parent; @@ -992,7 +1000,7 @@ protected: RenderScrollbarPart* m_resizer; private: - LayoutRect m_blockSelectionGapsBounds; + IntRect m_blockSelectionGapsBounds; #if USE(ACCELERATED_COMPOSITING) OwnPtr m_backing; -- cgit v1.2.1