Changeset 162517 in webkit

Timestamp:

Jan 22, 2014 6:53:15 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Background Blending] -webkit-background-blend-mode fails for certain SVG files
​https://bugs.webkit.org/show_bug.cgi?id=127350

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

Source/WebCore:

The graphics context of the SVG inherits the blend mode set
on the background layer. Fix consists in drawing the SVG
in a transparency layer.

Test: css3/compositing/background-blend-mode-svg.html

• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::draw): Begin a transparency layer if a blend mode is set.

LayoutTests:

• css3/compositing/background-blend-mode-svg-expected.html: Added.
• css3/compositing/background-blend-mode-svg.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-svg-expected.html (added)
• LayoutTests/css3/compositing/background-blend-mode-svg.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/graphics/SVGImage.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-01-22  Mihai Tica  <mitica@adobe.com>
+
+        [CSS Background Blending] -webkit-background-blend-mode fails for certain SVG files
+        https://bugs.webkit.org/show_bug.cgi?id=127350
+
+        Reviewed by Dirk Schulze.
+
+        * css3/compositing/background-blend-mode-svg-expected.html: Added.
+        * css3/compositing/background-blend-mode-svg.html: Added.
+
 2014-01-22  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-22  Mihai Tica  <mitica@adobe.com>
+
+        [CSS Background Blending] -webkit-background-blend-mode fails for certain SVG files
+        https://bugs.webkit.org/show_bug.cgi?id=127350
+
+        Reviewed by Dirk Schulze.
+
+        The graphics context of the SVG inherits the blend mode set
+        on the background layer. Fix consists in drawing the SVG
+        in a transparency layer.
+
+        Test: css3/compositing/background-blend-mode-svg.html
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::draw): Begin a transparency layer if a blend mode is set.
+
 2014-01-22  Antti Koivisto  <antti@apple.com>
 

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

@@ -227 +227 @@
     context->setCompositeOperation(compositeOp, blendMode);
     context->clip(enclosingIntRect(dstRect));
-    if (compositeOp != CompositeSourceOver)
+    bool compositingRequiresTransparencyLayer = compositeOp != CompositeSourceOver || blendMode != BlendModeNormal;
+    if (compositingRequiresTransparencyLayer) {
         context->beginTransparencyLayer(1);
+        context->setCompositeOperation(CompositeSourceOver, BlendModeNormal);
+    }
 
     FloatSize scale(dstRect.width() / srcRect.width(), dstRect.height() / srcRect.height());
@@ -247 +250 @@
     view->paint(context, enclosingIntRect(srcRect));
 
-    if (compositeOp != CompositeSourceOver)
+    if (compositingRequiresTransparencyLayer)
         context->endTransparencyLayer();