Changeset 52403 in webkit

Timestamp:

Dec 19, 2009 11:48:45 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-19 Eric Seidel <​eric@webkit.org>

No review, rolling out r52395.
​http://trac.webkit.org/changeset/52395

• svg/SVGMaskElement.cpp: (WebCore::SVGMaskElement::drawMaskerContent):
• svg/SVGMaskElement.h:
• svg/graphics/SVGResourceMasker.cpp: (WebCore::SVGResourceMasker::applyMask):
• svg/graphics/SVGResourceMasker.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGMaskElement.cpp (modified) (3 diffs)
• svg/SVGMaskElement.h (modified) (1 diff)
• svg/graphics/SVGResourceMasker.cpp (modified) (3 diffs)
• svg/graphics/SVGResourceMasker.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-19  Eric Seidel  <eric@webkit.org>
+
+        No review, rolling out r52395.
+        http://trac.webkit.org/changeset/52395
+
+        * svg/SVGMaskElement.cpp:
+        (WebCore::SVGMaskElement::drawMaskerContent):
+        * svg/SVGMaskElement.h:
+        * svg/graphics/SVGResourceMasker.cpp:
+        (WebCore::SVGResourceMasker::applyMask):
+        * svg/graphics/SVGResourceMasker.h:
+
 2009-12-19  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/svg/SVGMaskElement.cpp

@@ -127 +127 @@
 }
 
-PassOwnPtr<ImageBuffer> SVGMaskElement::drawMaskerContent(const FloatRect& targetRect, FloatRect& maskDestRect, IntRect& paintRect) const
+PassOwnPtr<ImageBuffer> SVGMaskElement::drawMaskerContent(const FloatRect& targetRect, FloatRect& maskDestRect) const
 {    
     // Determine specified mask size
@@ -170 +170 @@
     ASSERT(maskImageContext);
 
-    TransformationMatrix contextTransform;
-    contextTransform.translate(-maskContextLocation.x(), -maskContextLocation.y());
-    if (maskContentUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
-        contextTransform.scaleNonUniform(targetRect.width(), targetRect.height());
-
     maskImageContext->save();
-    maskImageContext->concatCTM(contextTransform);
-
-    FloatRect repaintRect;
+    maskImageContext->translate(-maskContextLocation.x(), -maskContextLocation.y());
+
+    if (maskContentUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
+        maskImageContext->save();
+        maskImageContext->scale(FloatSize(targetRect.width(), targetRect.height()));
+    }
+
     // Render subtree into ImageBuffer
     for (Node* n = firstChild(); n; n = n->nextSibling()) {
@@ -193 +192 @@
 
         renderSubtreeToImage(maskImage.get(), item);
-        repaintRect.unite(item->repaintRectInLocalCoordinates());
-    }
-
-    if (contextTransform.isInvertible()) {
-        contextTransform.inverse();
-        repaintRect = contextTransform.mapRect(repaintRect);
-        repaintRect.intersect(FloatRect(FloatPoint(), maskDestRect.size()));
-        paintRect = enclosingIntRect(repaintRect);
-    } else
-        paintRect = enclosingIntRect(FloatRect(FloatPoint(), maskDestRect.size()));
+    }
+
+    if (maskContentUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+        maskImageContext->restore();
 
     maskImageContext->restore();

trunk/WebCore/svg/SVGMaskElement.h

@@ -51 +51 @@
         virtual SVGResource* canvasResource();
 
-        PassOwnPtr<ImageBuffer> drawMaskerContent(const FloatRect& targetRect, FloatRect& maskRect, IntRect& paintRect) const;
+        PassOwnPtr<ImageBuffer> drawMaskerContent(const FloatRect& targetRect, FloatRect& maskRect) const;
 
     private:

trunk/WebCore/svg/graphics/SVGResourceMasker.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
- *               2009 Dirk Schulze <krit@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40 +39 @@
 #include "TextStream.h"
 
+#include <wtf/ByteArray.h>
+
 using namespace std;
 
@@ -63 +64 @@
 {
     if (!m_mask)
-        m_mask = m_ownerElement->drawMaskerContent(boundingBox, m_maskRect, m_paintRect);
+        m_mask = m_ownerElement->drawMaskerContent(boundingBox, m_maskRect);
 
     if (!m_mask)
         return;
 
-    RefPtr<ImageData> imageData(m_mask->getUnmultipliedImageData(m_paintRect));
-    CanvasPixelArray* srcPixelArray(imageData->data());
+    IntSize imageSize(m_mask->size());
+    IntRect intImageRect(0, 0, imageSize.width(), imageSize.height());
 
-    for (unsigned pixelOffset = 0; pixelOffset < srcPixelArray->length(); pixelOffset += 4) {
-        unsigned char a = srcPixelArray->get(pixelOffset + 3);
-        if (!a)
-            continue;
-        unsigned char r = srcPixelArray->get(pixelOffset);
-        unsigned char g = srcPixelArray->get(pixelOffset + 1);
-        unsigned char b = srcPixelArray->get(pixelOffset + 2);
+    // Create new ImageBuffer to apply luminance
+    OwnPtr<ImageBuffer> luminancedImage = ImageBuffer::create(imageSize);
+    if (!luminancedImage)
+        return;
+
+    PassRefPtr<CanvasPixelArray> srcPixelArray(m_mask->getUnmultipliedImageData(intImageRect)->data());
+    PassRefPtr<ImageData> destImageData(luminancedImage->getUnmultipliedImageData(intImageRect));
+
+    for (unsigned pixelOffset = 0; pixelOffset < srcPixelArray->length(); pixelOffset++) {
+        unsigned pixelByteOffset = pixelOffset * 4;
+
+        unsigned char r = 0, g = 0, b = 0, a = 0;
+        srcPixelArray->get(pixelByteOffset, r);
+        srcPixelArray->get(pixelByteOffset + 1, g);
+        srcPixelArray->get(pixelByteOffset + 2, b);
+        srcPixelArray->get(pixelByteOffset + 3, a);
 
         double luma = (r * 0.2125 + g * 0.7154 + b * 0.0721) * ((double)a / 255.0);
-        srcPixelArray->set(pixelOffset + 3, luma);
+
+        destImageData->data()->set(pixelByteOffset + 3, luma);
     }
 
-    m_mask->putUnmultipliedImageData(imageData.get(), IntRect(IntPoint(), m_paintRect.size()), m_paintRect.location());
-    context->clipToImageBuffer(m_maskRect, m_mask.get());
+    luminancedImage->putUnmultipliedImageData(destImageData.get(), intImageRect, IntPoint(0, 0));
+
+    context->clipToImageBuffer(m_maskRect, luminancedImage.get());
 }
 

trunk/WebCore/svg/graphics/SVGResourceMasker.h

@@ -63 +63 @@
         OwnPtr<ImageBuffer> m_mask;
         FloatRect m_maskRect;
-        IntRect m_paintRect;
     };