Changeset 162442 in webkit

Timestamp:

Jan 21, 2014 8:36:50 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Source/WebCore: If you set a tiled cross-faded-image or a tiled gradient as
a background layer, -webkit-background-blend-mode doesn't work.
The problem consists in the blendMode parameter not being set
for these specific drawing paths.

​https://bugs.webkit.org/show_bug.cgi?id=126888
Patch by Mihai Tica <​mitica@adobe.com> on 2014-01-21
Reviewed by Dirk Schulze.

Test: css3/compositing/background-blend-mode-tiled-layers.html

• platform/graphics/CrossfadeGeneratedImage.cpp:

(WebCore::CrossfadeGeneratedImage::drawPattern): Add the blendMode parameter and pass it to ImageBuffer::drawPattern.

• platform/graphics/GradientImage.cpp:

(WebCore::GradientImage::drawPattern): Add the blendMode parameter and pass it to ImageBuffer::drawPattern.

• platform/graphics/ImageBuffer.h: Add a BlendMode parameter to the drawPattern method.
• platform/graphics/cairo/ImageBufferCairo.cpp:

(WebCore::ImageBuffer::drawPattern): Add the default BlendMode parameter to the method declaration.

• platform/graphics/cg/ImageBufferCG.cpp:

(WebCore::ImageBuffer::drawPattern): Add and use the blendMode parameter for all the code paths.

• platform/graphics/wince/ImageBufferWinCE.cpp:

(WebCore::BufferedImage::drawPattern): Add the default BlendMode parameter to the method declaration.

LayoutTests: If you set a tiled cross-faded-image or a tiled gradient as
a background layer, -webkit-background-blend-mode doesn't work.
​https://bugs.webkit.org/show_bug.cgi?id=126888

Patch by Mihai Tica <​mitica@adobe.com> on 2014-01-21
Reviewed by Dirk Schulze.

• css3/compositing/background-blend-mode-tiled-layers-expected.html: Added.
• css3/compositing/background-blend-mode-tiled-layers.html: Added.
• platform/efl/TestExpectations: Skip test for efl, blendModes are not implemented.
• platform/mac/TestExpectations: Mark added test as ImageOnlyFailure due to slight differences between the actual result and the blending formula.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-tiled-layers-expected.html (added)
• LayoutTests/css3/compositing/background-blend-mode-tiled-layers.html (added)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/GradientImage.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/ImageBuffer.h (modified) (1 diff)
• Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-01-21  Mihai Tica  <mitica@adobe.com>
+
+        If you set a tiled cross-faded-image or a tiled gradient as
+        a background layer, -webkit-background-blend-mode doesn't work.
+        https://bugs.webkit.org/show_bug.cgi?id=126888
+
+        Reviewed by Dirk Schulze.
+
+        * css3/compositing/background-blend-mode-tiled-layers-expected.html: Added.
+        * css3/compositing/background-blend-mode-tiled-layers.html: Added.
+        * platform/efl/TestExpectations: Skip test for efl, blendModes are not implemented.
+        * platform/mac/TestExpectations: Mark added test as ImageOnlyFailure due to slight differences between the actual result and the blending formula.
+
 2014-01-21  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -500 +500 @@
 webkit.org/b/99200 css3/compositing/blend-mode-should-not-have-compositing-layer.html [ Skip ]
 webkit.org/b/118894 css3/compositing/background-blend-mode-data-uri-svg-image.html [ Skip ]
+webkit.org/b/126888 css3/compositing/background-blend-mode-tiled-layers.html [ Skip ]
 
 # No concept of secure text input

trunk/LayoutTests/platform/mac/TestExpectations

@@ -618 +618 @@
 # Blend mode result is slightly different than the applied formula.
 css3/compositing/background-blend-mode-data-uri-svg-image.html [ ImageOnlyFailure Pass ]
+css3/compositing/background-blend-mode-tiled-layers.html [ ImageOnlyFailure Pass ]
+css3/compositing/background-blend-mode-crossfade-image.html [ ImageOnlyFailure Pass ]
 
 # https://bugs.webkit.org/show_bug.cgi?id=110871
@@ -661 +663 @@
 css3/filters/composited-during-transition-layertree.html
 webkit.org/b/95622 css3/filters/composited-during-animation-layertree.html [ Pass Failure ]
-
-# Blending result is slightly different than the formula.
-webkit.org/b/126887 css3/compositing/background-blend-mode-crossfade-image.html [ ImageOnlyFailure Pass ]
 
 # --- Custom Filters ---

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-21  Mihai Tica  <mitica@adobe.com>
+
+        If you set a tiled cross-faded-image or a tiled gradient as
+        a background layer, -webkit-background-blend-mode doesn't work.
+        The problem consists in the blendMode parameter not being set
+        for these specific drawing paths.
+
+        https://bugs.webkit.org/show_bug.cgi?id=126888
+        Reviewed by Dirk Schulze.
+
+        Test: css3/compositing/background-blend-mode-tiled-layers.html
+
+        * platform/graphics/CrossfadeGeneratedImage.cpp:
+        (WebCore::CrossfadeGeneratedImage::drawPattern): Add the blendMode parameter and pass it to ImageBuffer::drawPattern.
+        * platform/graphics/GradientImage.cpp:
+        (WebCore::GradientImage::drawPattern): Add the blendMode parameter and pass it to ImageBuffer::drawPattern.
+        * platform/graphics/ImageBuffer.h: Add a BlendMode parameter to the drawPattern method.
+        * platform/graphics/cairo/ImageBufferCairo.cpp:
+        (WebCore::ImageBuffer::drawPattern): Add the default BlendMode parameter to the method declaration.
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::ImageBuffer::drawPattern): Add and use the blendMode parameter for all the code paths.
+        * platform/graphics/wince/ImageBufferWinCE.cpp:
+        (WebCore::BufferedImage::drawPattern): Add the default BlendMode parameter to the method declaration.
+
 2014-01-21  Gurpreet Kaur  <k.gurpreet@samsung.com>
 

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

@@ -97 +97 @@
 }
 
-void CrossfadeGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode)
+void CrossfadeGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
 {
     std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, context->isAcceleratedContext() ? Accelerated : Unaccelerated);
@@ -108 +108 @@
 
     // Tile the image buffer into the context.
-    imageBuffer->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, compositeOp, dstRect);
+    imageBuffer->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, compositeOp, dstRect, blendMode);
 }
 

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

@@ -46 +46 @@
 
 void GradientImage::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform,
-    const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& destRect, BlendMode)
+    const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& destRect, BlendMode blendMode)
 {
     // Allow the generator to provide visually-equivalent tiling parameters for better performance.
@@ -82 +82 @@
 
     // Tile the image buffer into the context.
-    m_cachedImageBuffer->drawPattern(destContext, adjustedSrcRect, adjustedPatternCTM, phase, styleColorSpace, compositeOp, destRect);
+    m_cachedImageBuffer->drawPattern(destContext, adjustedSrcRect, adjustedPatternCTM, phase, styleColorSpace, compositeOp, destRect, blendMode);
 }
 

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

@@ -144 +144 @@
 
         void draw(GraphicsContext*, ColorSpace, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, bool useLowQualityScale = false);
-        void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
+        void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
 
         inline void genericConvertToLuminanceMask();

trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

@@ -154 +154 @@
 
 void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
-                              const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
+    const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
 {
     RefPtr<Image> image = copyImage(DontCopyBackingStore);

trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -308 +308 @@
 }
 
-void ImageBuffer::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
+void ImageBuffer::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
 {
     FloatRect adjustedSrcRect = srcRect;
@@ -316 +316 @@
         if (destContext == m_context || destContext->isAcceleratedContext()) {
             RefPtr<Image> copy = copyImage(CopyBackingStore); // Drawing into our own buffer, need to deep copy.
-            copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect);
+            copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect, blendMode);
         } else {
             RefPtr<Image> imageForRendering = copyImage(DontCopyBackingStore);
-            imageForRendering->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect);
+            imageForRendering->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect, blendMode);
         }
     } else {
         RefPtr<Image> copy = copyImage(CopyBackingStore);
-        copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect);
+        copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect, blendMode);
     }
 }

trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp

@@ -57 +57 @@
 
 void BufferedImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
-                             const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
+    const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
 {
     m_data->m_bitmap->drawPattern(ctxt, tileRectIn, patternTransform, phase, styleColorSpace, op, destRect, size());