From f486d19d62f1bc33246748b14b14a9dfa617b57f Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Thu, 19 Aug 2010 17:55:56 +0100 Subject: Merge WebKit at r65615 : Initial merge by git. Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79 --- WebCore/rendering/RenderSVGResourceClipper.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'WebCore/rendering/RenderSVGResourceClipper.cpp') diff --git a/WebCore/rendering/RenderSVGResourceClipper.cpp b/WebCore/rendering/RenderSVGResourceClipper.cpp index a201d1f..626a880 100644 --- a/WebCore/rendering/RenderSVGResourceClipper.cpp +++ b/WebCore/rendering/RenderSVGResourceClipper.cpp @@ -64,7 +64,7 @@ RenderSVGResourceClipper::~RenderSVGResourceClipper() m_clipper.clear(); } -void RenderSVGResourceClipper::invalidateClients() +void RenderSVGResourceClipper::removeAllClientsFromCache(bool markForInvalidation) { if (m_invalidationBlocked) return; @@ -75,20 +75,19 @@ void RenderSVGResourceClipper::invalidateClients() m_clipper.clear(); } - markAllClientsForInvalidation(LayoutAndBoundariesInvalidation); + markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation); } -void RenderSVGResourceClipper::invalidateClient(RenderObject* client) +void RenderSVGResourceClipper::removeClientFromCache(RenderObject* client, bool markForInvalidation) { ASSERT(client); if (m_invalidationBlocked) return; - ASSERT(client->selfNeedsLayout()); if (m_clipper.contains(client)) delete m_clipper.take(client); - markClientForInvalidation(client, BoundariesInvalidation); + markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation); } bool RenderSVGResourceClipper::applyResource(RenderObject* object, RenderStyle*, GraphicsContext*& context, unsigned short resourceMode) @@ -174,7 +173,7 @@ bool RenderSVGResourceClipper::applyClippingToContext(RenderObject* object, cons if (!clipperData->clipMaskImage) return false; - context->clipToImageBuffer(repaintRect, clipperData->clipMaskImage.get()); + context->clipToImageBuffer(clipperData->clipMaskImage.get(), repaintRect); return true; } -- cgit v1.1