Changeset 65729 in webkit

Timestamp:

Aug 20, 2010 2:13:49 AM (14 years ago)

Author:

Nikolas Zimmermann

Message:

2010-08-20 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Clippers are rasterized, when applied to scaled target object
​https://bugs.webkit.org/show_bug.cgi?id=44325

Use SVGImageBufferTools logic for RenderSVGResourceClipper, just like RenderSVGResourceMasker/Gradient,
to avoid pixelation, when the clipper is applied to a scaled target object, or when the document is scaled.

Test: svg/clip-path/clip-path-pixelation.svg

• rendering/RenderSVGResourceClipper.cpp: (WebCore::RenderSVGResourceClipper::applyClippingToContext): (WebCore::RenderSVGResourceClipper::createClipData):
• rendering/RenderSVGResourceClipper.h:

2010-08-20 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Clippers are rasterized, when applied to scaled target object
​https://bugs.webkit.org/show_bug.cgi?id=44325

• platform/mac/svg/clip-path/clip-path-pixelation-expected.checksum: Added.
• platform/mac/svg/clip-path/clip-path-pixelation-expected.png: Added.
• platform/mac/svg/clip-path/clip-path-pixelation-expected.txt: Added.
• svg/clip-path/clip-path-pixelation.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/clip-path/clip-path-pixelation-expected.checksum (added)
• LayoutTests/platform/mac/svg/clip-path/clip-path-pixelation-expected.png (added)
• LayoutTests/platform/mac/svg/clip-path/clip-path-pixelation-expected.txt (added)
• LayoutTests/svg/clip-path/clip-path-pixelation.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderSVGResourceClipper.cpp (modified) (3 diffs)
• WebCore/rendering/RenderSVGResourceClipper.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-20  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Clippers are rasterized, when applied to scaled target object
+        https://bugs.webkit.org/show_bug.cgi?id=44325
+
+        * platform/mac/svg/clip-path/clip-path-pixelation-expected.checksum: Added.
+        * platform/mac/svg/clip-path/clip-path-pixelation-expected.png: Added.
+        * platform/mac/svg/clip-path/clip-path-pixelation-expected.txt: Added.
+        * svg/clip-path/clip-path-pixelation.svg: Added.
+
 2010-08-19  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-20  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Clippers are rasterized, when applied to scaled target object
+        https://bugs.webkit.org/show_bug.cgi?id=44325
+
+        Use SVGImageBufferTools logic for RenderSVGResourceClipper, just like RenderSVGResourceMasker/Gradient,
+        to avoid pixelation, when the clipper is applied to a scaled target object, or when the document is scaled.
+
+        Test: svg/clip-path/clip-path-pixelation.svg
+
+        * rendering/RenderSVGResourceClipper.cpp:
+        (WebCore::RenderSVGResourceClipper::applyClippingToContext):
+        (WebCore::RenderSVGResourceClipper::createClipData):
+        * rendering/RenderSVGResourceClipper.h:
+
 2010-08-20  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebCore/rendering/RenderSVGResourceClipper.cpp

@@ -38 +38 @@
 #include "SVGClipPathElement.h"
 #include "SVGElement.h"
+#include "SVGImageBufferTools.h"
 #include "SVGRenderSupport.h"
 #include "SVGResources.h"
@@ -164 +165 @@
         m_clipper.set(object, new ClipperData);
 
+    bool shouldCreateClipData = false;
     ClipperData* clipperData = m_clipper.get(object);
     if (!clipperData->clipMaskImage) {
         if (pathOnlyClipping(context, objectBoundingBox))
             return true;
-        createClipData(clipperData, objectBoundingBox, repaintRect);
-    }
+        shouldCreateClipData = true;
+    }
+
+    AffineTransform absoluteTransform = SVGImageBufferTools::transformationToOutermostSVGCoordinateSystem(object);
+    FloatRect clampedAbsoluteTargetRect = SVGImageBufferTools::clampedAbsoluteTargetRectForRenderer(object, absoluteTransform, repaintRect);
+
+    if (shouldCreateClipData)
+        createClipData(clipperData, objectBoundingBox, repaintRect, clampedAbsoluteTargetRect, absoluteTransform);
 
     if (!clipperData->clipMaskImage)
         return false;
 
-    context->clipToImageBuffer(clipperData->clipMaskImage.get(), repaintRect);
+    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, clampedAbsoluteTargetRect, clipperData->clipMaskImage.get());
     return true;
 }
 
-bool RenderSVGResourceClipper::createClipData(ClipperData* clipperData, const FloatRect& objectBoundingBox, const FloatRect& repaintRect)
-{
-    IntRect clipMaskRect = enclosingIntRect(repaintRect);
-    clipperData->clipMaskImage = ImageBuffer::create(clipMaskRect.size());
-    if (!clipperData->clipMaskImage)
+bool RenderSVGResourceClipper::createClipData(ClipperData* clipperData,
+                                              const FloatRect& objectBoundingBox,
+                                              const FloatRect& repaintRect,
+                                              const FloatRect& clampedAbsoluteTargetRect,
+                                              const AffineTransform& absoluteTransform)
+{
+    if (!SVGImageBufferTools::createImageBuffer(clampedAbsoluteTargetRect, clipperData->clipMaskImage, DeviceRGB))
         return false;
 
@@ -189 +199 @@
 
     maskContext->save();
-    maskContext->translate(-repaintRect.x(), -repaintRect.y());
+    maskContext->translate(-clampedAbsoluteTargetRect.x(), -clampedAbsoluteTargetRect.y());
+    maskContext->concatCTM(absoluteTransform);
 
     // clipPath can also be clipped by another clipPath.

trunk/WebCore/rendering/RenderSVGResourceClipper.h

@@ -66 +66 @@
     bool applyClippingToContext(RenderObject*, const FloatRect&, const FloatRect&, GraphicsContext*);
     bool pathOnlyClipping(GraphicsContext*, const FloatRect&);
-    bool createClipData(ClipperData*, const FloatRect&, const FloatRect&);
+    bool createClipData(ClipperData*, const FloatRect& objectBoundingBox, const FloatRect& repaintRect, const FloatRect& clampedAbsoluteTargetRect, const AffineTransform& absoluteTransform);
+
     void calculateClipContentRepaintRect();