Changeset 156391 in webkit

Timestamp:

Sep 25, 2013 6:53:08 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

<​https://webkit.org/b/120476> [CSS Masking] Implement luminance masking

Source/WebCore:

Added implementation for luminance masking. A luminance mask is applied by transforming its RGB values into
an alpha value, using luminance-to-alpha coefficients. Because this conversion is already implemented in
the ImageBuffer class, we used it in our implementation.

Patch by Andrei Parvu <​parvu@adobe.com> on 2013-09-25
Reviewed by Dirk Schulze.

Tests: css3/masking/mask-luminance-gradient.html

css3/masking/mask-luminance-png.html
css3/masking/mask-luminance-svg.html

• platform/graphics/BitmapImage.cpp: Add a drawPattern method, in which an ImageBuffer is created and converted from alpha to luminance, if there is a luminance mask.

(WebCore::BitmapImage::BitmapImage):
(WebCore::BitmapImage::drawPattern):

• platform/graphics/BitmapImage.h:
• platform/graphics/GeneratorGeneratedImage.cpp: Convert the ImageBuffer to luminance, if necessary.

(WebCore::GeneratorGeneratedImage::drawPattern):

• platform/graphics/GraphicsContext.cpp: Add methods which set and check if a luminance mask is drawn.

(WebCore::GraphicsContext::setDrawLuminanceMask):
(WebCore::GraphicsContext::drawLuminanceMask):

• platform/graphics/GraphicsContext.h: Add property to ContextState for luminance drawing.

(WebCore::GraphicsContextState::GraphicsContextState):

• rendering/RenderBoxModelObject.cpp: Set the luminance property of the mask, if the layer has a mask source type of luminance.

(WebCore::RenderBoxModelObject::paintFillLayerExtended):

• svg/graphics/SVGImage.cpp: Convert the ImageBuffer to luminance, if necessary.

(WebCore::SVGImage::drawPatternForContainer):

• svg/graphics/SVGImageForContainer.cpp: Pass the luminance property to the SVG image.

(WebCore::SVGImageForContainer::drawPattern):

LayoutTests:

Added tests to verify the implementation of luminance masking.

Patch by Andrei Parvu <​parvu@adobe.com> on 2013-09-25
Reviewed by Dirk Schulze.

• css3/masking/mask-luminance-gradient-expected.html: Added.
• css3/masking/mask-luminance-gradient.html: Added.
• css3/masking/mask-luminance-png.html: Added.
• css3/masking/mask-luminance-svg-expected.html: Added.
• css3/masking/mask-luminance-svg.html: Added.
• css3/masking/resources/circle-alpha.svg: Added.
• css3/masking/resources/circle2.svg: Added.
• css3/masking/resources/dice.png: Added.
• platform/mac/css3/masking/mask-luminance-png-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/masking/mask-luminance-gradient-expected.html (added)
• LayoutTests/css3/masking/mask-luminance-gradient.html (added)
• LayoutTests/css3/masking/mask-luminance-png.html (added)
• LayoutTests/css3/masking/mask-luminance-svg-expected.html (added)
• LayoutTests/css3/masking/mask-luminance-svg.html (added)
• LayoutTests/css3/masking/resources/circle-alpha.svg (added)
• LayoutTests/css3/masking/resources/circle2.svg (added)
• LayoutTests/css3/masking/resources/dice.png (added)
• LayoutTests/platform/mac/css3/masking/mask-luminance-png-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/BitmapImage.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/BitmapImage.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/GradientImage.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsContext.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsContext.h (modified) (3 diffs)
• Source/WebCore/platform/graphics/Image.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• Source/WebCore/svg/graphics/SVGImage.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-25  Andrei Parvu  <parvu@adobe.com>
+
+        <https://webkit.org/b/120476> [CSS Masking] Implement luminance masking
+
+        Added tests to verify the implementation of luminance masking.
+
+        Reviewed by Dirk Schulze.
+
+        * css3/masking/mask-luminance-gradient-expected.html: Added.
+        * css3/masking/mask-luminance-gradient.html: Added.
+        * css3/masking/mask-luminance-png.html: Added.
+        * css3/masking/mask-luminance-svg-expected.html: Added.
+        * css3/masking/mask-luminance-svg.html: Added.
+        * css3/masking/resources/circle-alpha.svg: Added.
+        * css3/masking/resources/circle2.svg: Added.
+        * css3/masking/resources/dice.png: Added.
+        * platform/mac/css3/masking/mask-luminance-png-expected.txt: Added.
+
 2013-09-25  Krzysztof Czech  <k.czech@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-25  Andrei Parvu  <parvu@adobe.com>
+
+        <https://webkit.org/b/120476> [CSS Masking] Implement luminance masking
+
+        Added implementation for luminance masking. A luminance mask is applied by transforming its RGB values into
+        an alpha value, using luminance-to-alpha coefficients. Because this conversion is already implemented in
+        the ImageBuffer class, we used it in our implementation.
+
+        Reviewed by Dirk Schulze.
+
+        Tests: css3/masking/mask-luminance-gradient.html
+               css3/masking/mask-luminance-png.html
+               css3/masking/mask-luminance-svg.html
+
+        * platform/graphics/BitmapImage.cpp: Add a drawPattern method, in which an ImageBuffer is created and converted from alpha to luminance, if there is a luminance mask.
+        (WebCore::BitmapImage::BitmapImage):
+        (WebCore::BitmapImage::drawPattern):
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/GeneratorGeneratedImage.cpp: Convert the ImageBuffer to luminance, if necessary.
+        (WebCore::GeneratorGeneratedImage::drawPattern):
+        * platform/graphics/GraphicsContext.cpp: Add methods which set and check if a luminance mask is drawn.
+        (WebCore::GraphicsContext::setDrawLuminanceMask):
+        (WebCore::GraphicsContext::drawLuminanceMask):
+        * platform/graphics/GraphicsContext.h: Add property to ContextState for luminance drawing.
+        (WebCore::GraphicsContextState::GraphicsContextState):
+        * rendering/RenderBoxModelObject.cpp: Set the luminance property of the mask, if the layer has a mask source type of luminance.
+        (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+        * svg/graphics/SVGImage.cpp: Convert the ImageBuffer to luminance, if necessary.
+        (WebCore::SVGImage::drawPatternForContainer):
+        * svg/graphics/SVGImageForContainer.cpp: Pass the luminance property to the SVG image.
+        (WebCore::SVGImageForContainer::drawPattern):
+
 2013-09-25  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/platform/graphics/BitmapImage.cpp

@@ -29 +29 @@
 
 #include "FloatRect.h"
+#include "ImageBuffer.h"
 #include "ImageObserver.h"
 #include "IntRect.h"
@@ -59 +60 @@
     , m_hasUniformFrameSize(true)
     , m_haveFrameCount(false)
+    , m_cachedImage(0)
 {
 }
@@ -493 +495 @@
 }
 
+void BitmapImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const AffineTransform& transform,
+    const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
+{
+    if (tileRect.isEmpty())
+        return;
+
+    if (!ctxt->drawLuminanceMask()) {
+        Image::drawPattern(ctxt, tileRect, transform, phase, styleColorSpace, op, destRect, blendMode);
+        return;
+    }
+    if (!m_cachedImage) {
+        OwnPtr<ImageBuffer> buffer = ImageBuffer::create(expandedIntSize(tileRect.size()));
+        ASSERT(buffer.get() > 0);
+
+        ImageObserver* observer = imageObserver();
+        ASSERT(observer);
+
+        // Temporarily reset image observer, we don't want to receive any changeInRect() calls due to this relayout.
+        setImageObserver(0);
+
+        draw(buffer->context(), tileRect, tileRect, styleColorSpace, op, blendMode);
+
+        setImageObserver(observer);
+        buffer->convertToLuminanceMask();
+
+        m_cachedImage = buffer->copyImage(DontCopyBackingStore, Unscaled);
+        m_cachedImage->setSpaceSize(spaceSize());
+
+        setImageObserver(observer);
+    }
+
+    ctxt->setDrawLuminanceMask(false);
+    m_cachedImage->drawPattern(ctxt, tileRect, transform, phase, styleColorSpace, op, destRect, blendMode);
+}
 
 

trunk/Source/WebCore/platform/graphics/BitmapImage.h

@@ -137 +137 @@
     virtual unsigned decodedSize() const OVERRIDE;
 
+    virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
+        const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal) OVERRIDE;
+
 #if PLATFORM(MAC)
     // Accessors for native image formats.
@@ -297 +300 @@
     mutable bool m_hasUniformFrameSize : 1;
     mutable bool m_haveFrameCount : 1;
+
+    RefPtr<Image> m_cachedImage;
 };
 

trunk/Source/WebCore/platform/graphics/GradientImage.cpp

@@ -73 +73 @@
         m_cachedGeneratorHash = generatorHash;
         m_cachedAdjustedSize = adjustedSize;
+
+        if (destContext->drawLuminanceMask())
+            m_cachedImageBuffer->convertToLuminanceMask();
     }
 
     m_cachedImageBuffer->setSpaceSize(spaceSize());
+    destContext->setDrawLuminanceMask(false);
+
     // Tile the image buffer into the context.
     m_cachedImageBuffer->drawPattern(destContext, adjustedSrcRect, adjustedPatternCTM, phase, styleColorSpace, compositeOp, destRect);

trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

@@ -739 +739 @@
 }
 
+void GraphicsContext::setDrawLuminanceMask(bool drawLuminanceMask)
+{
+    m_state.drawLuminanceMask = drawLuminanceMask;
+}
+
+bool GraphicsContext::drawLuminanceMask() const
+{
+    return m_state.drawLuminanceMask;
+}
+
 #if !USE(CG)
 // Implement this if you want to go ahead and push the drawing mode into your native context

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -151 +151 @@
             , shadowsUseLegacyRadius(false)
 #endif
+            , drawLuminanceMask(false)
         {
         }
@@ -189 +190 @@
         bool shadowsUseLegacyRadius : 1;
 #endif
+        bool drawLuminanceMask : 1;
     };
 
@@ -382 +384 @@
         CompositeOperator compositeOperation() const;
         BlendMode blendModeOperation() const;
+
+        void setDrawLuminanceMask(bool);
+        bool drawLuminanceMask() const;
 
         void clip(const Path&, WindRule = RULE_EVENODD);

trunk/Source/WebCore/platform/graphics/Image.cpp

@@ -121 +121 @@
     
     // Check and see if a single draw of the image can cover the entire area we are supposed to tile.    
-    if (oneTileRect.contains(destRect)) {
+    if (oneTileRect.contains(destRect) && !ctxt->drawLuminanceMask()) {
         FloatRect visibleSrcRect;
         visibleSrcRect.setX((destRect.x() - oneTileRect.x()) / scale.width());

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -798 +798 @@
             RenderObject* clientForBackgroundImage = backgroundObject ? backgroundObject : this;
             RefPtr<Image> image = bgImage->image(clientForBackgroundImage, geometry.tileSize());
+            context->setDrawLuminanceMask(bgLayer->maskSourceType() == MaskLuminance);
             bool useLowQualityScaling = shouldPaintAtLowQuality(context, image.get(), bgLayer, geometry.tileSize());
             if (image.get())

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -202 +202 @@
         return;
     drawForContainer(buffer->context(), containerSize, zoom, imageBufferSize, zoomedContainerRect, ColorSpaceDeviceRGB, CompositeSourceOver, BlendModeNormal);
+    if (context->drawLuminanceMask())
+        buffer->convertToLuminanceMask();
+
     RefPtr<Image> image = buffer->copyImage(DontCopyBackingStore, Unscaled);
     image->setSpaceSize(spaceSize());
@@ -211 +214 @@
     unscaledPatternTransform.scale(1 / imageBufferScale.width(), 1 / imageBufferScale.height());
 
+    context->setDrawLuminanceMask(false);
     image->drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, colorSpace, compositeOp, dstRect);
 }