[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[zimmermann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit edb9f707d43a87a8cc0fecf5bbec084259fad93d
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 10:30:31 2010 +0000

    2010-08-12  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Not reviewed. Follow up to Jeremys fix, just remove the context parameter, it's not needed anymore.
    
            * rendering/RenderSVGResourceGradient.cpp:
            (WebCore::createMaskAndSwapContextForTextGradient):
            * rendering/RenderSVGResourceMasker.cpp:
            (WebCore::RenderSVGResourceMasker::applyResource):
            * rendering/SVGImageBufferTools.cpp:
            (WebCore::SVGImageBufferTools::createImageBuffer):
            * rendering/SVGImageBufferTools.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65232 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4fb7ee8..f3ebab1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-12  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Not reviewed. Follow up to Jeremys fix, just remove the context parameter, it's not needed anymore.
+
+        * rendering/RenderSVGResourceGradient.cpp:
+        (WebCore::createMaskAndSwapContextForTextGradient):
+        * rendering/RenderSVGResourceMasker.cpp:
+        (WebCore::RenderSVGResourceMasker::applyResource):
+        * rendering/SVGImageBufferTools.cpp:
+        (WebCore::SVGImageBufferTools::createImageBuffer):
+        * rendering/SVGImageBufferTools.h:
+
 2010-08-12  Jeremy Orlow  <jorlow at chromium.org>
 
         Build fix.
diff --git a/WebCore/rendering/RenderSVGResourceGradient.cpp b/WebCore/rendering/RenderSVGResourceGradient.cpp
index b8d953d..9716236 100644
--- a/WebCore/rendering/RenderSVGResourceGradient.cpp
+++ b/WebCore/rendering/RenderSVGResourceGradient.cpp
@@ -85,7 +85,7 @@ static inline bool createMaskAndSwapContextForTextGradient(GraphicsContext*& con
     FloatRect absoluteTargetRect = absoluteTransform.mapRect(textRootBlock->repaintRectInLocalCoordinates());
 
     OwnPtr<ImageBuffer> maskImage;
-    if (!SVGImageBufferTools::createImageBuffer(context, absoluteTransform, absoluteTargetRect, maskImage, DeviceRGB))
+    if (!SVGImageBufferTools::createImageBuffer(absoluteTransform, absoluteTargetRect, maskImage, DeviceRGB))
         return false;
 
     ASSERT(maskImage);
diff --git a/WebCore/rendering/RenderSVGResourceMasker.cpp b/WebCore/rendering/RenderSVGResourceMasker.cpp
index 1798453..4c27a53 100644
--- a/WebCore/rendering/RenderSVGResourceMasker.cpp
+++ b/WebCore/rendering/RenderSVGResourceMasker.cpp
@@ -105,7 +105,7 @@ bool RenderSVGResourceMasker::applyResource(RenderObject* object, RenderStyle*,
         if (!maskElement)
             return false;
 
-        if (!SVGImageBufferTools::createImageBuffer(context, absoluteTransform, maskRect, maskerData->maskImage, LinearRGB))
+        if (!SVGImageBufferTools::createImageBuffer(absoluteTransform, maskRect, maskerData->maskImage, LinearRGB))
             return false;
 
         ASSERT(maskerData->maskImage);
diff --git a/WebCore/rendering/SVGImageBufferTools.cpp b/WebCore/rendering/SVGImageBufferTools.cpp
index 29ccf29..30b6bd2 100644
--- a/WebCore/rendering/SVGImageBufferTools.cpp
+++ b/WebCore/rendering/SVGImageBufferTools.cpp
@@ -35,10 +35,8 @@ AffineTransform SVGImageBufferTools::absoluteTransformFromContext(GraphicsContex
     return context->getCTM() * AffineTransform().flipY();
 }
 
-bool SVGImageBufferTools::createImageBuffer(GraphicsContext* context, const AffineTransform& absoluteTransform, const FloatRect& absoluteTargetRect, OwnPtr<ImageBuffer>& imageBuffer, ImageColorSpace colorSpace)
+bool SVGImageBufferTools::createImageBuffer(const AffineTransform& absoluteTransform, const FloatRect& absoluteTargetRect, OwnPtr<ImageBuffer>& imageBuffer, ImageColorSpace colorSpace)
 {
-    ASSERT_UNUSED(context, context);
-
     IntRect imageRect = enclosingIntRect(absoluteTargetRect);
     if (imageRect.isEmpty())
         return false;
diff --git a/WebCore/rendering/SVGImageBufferTools.h b/WebCore/rendering/SVGImageBufferTools.h
index ed29c06..bdbcb1c 100644
--- a/WebCore/rendering/SVGImageBufferTools.h
+++ b/WebCore/rendering/SVGImageBufferTools.h
@@ -33,7 +33,7 @@ class RenderObject;
 
 class SVGImageBufferTools : public Noncopyable {
 public:
-    static bool createImageBuffer(GraphicsContext*, const AffineTransform& absoluteTransform, const FloatRect& absoluteTargetRect, OwnPtr<ImageBuffer>&, ImageColorSpace);
+    static bool createImageBuffer(const AffineTransform& absoluteTransform, const FloatRect& absoluteTargetRect, OwnPtr<ImageBuffer>&, ImageColorSpace);
     static void clipToImageBuffer(GraphicsContext*, const AffineTransform& absoluteTransform, const FloatRect& absoluteTargetRect, ImageBuffer*);
 
     static AffineTransform absoluteTransformFromContext(GraphicsContext*);

-- 
WebKit Debian packaging