<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161964] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161964">161964</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-14 07:38:26 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: Background-blend-mode doesn't work for an element with an
SVG image as background and border-style or padding set.
The problem consisted in the drawing path using the default
blending parameter at all times.
https://bugs.webkit.org/show_bug.cgi?id=118894
Patch by Mihai Tica <mitica@adobe.com> on 2014-01-14
Reviewed by Dirk Schulze.
Test: css3/compositing/background-blend-mode-data-uri-svg-image.html
* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::drawPatternForContainer): Pass blendMode to Image::drawPattern.
* svg/graphics/SVGImage.h: Add a blendMode parameter to drawPatternForContainer.
* svg/graphics/SVGImageForContainer.cpp:
(WebCore::SVGImageForContainer::drawPattern): Pass blendMode to drawPatternForContainer call.
LayoutTests: Background-blend-mode doesn't work for an element with an
SVG image as background and border-style or padding set.
https://bugs.webkit.org/show_bug.cgi?id=118894
Patch by Mihai Tica <mitica@adobe.com> on 2014-01-14
Reviewed by Dirk Schulze.
* css3/compositing/background-blend-mode-data-uri-svg-image-expected.html: Added.
* css3/compositing/background-blend-mode-data-uri-svg-image.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImagecpp">trunk/Source/WebCore/svg/graphics/SVGImage.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImageh">trunk/Source/WebCore/svg/graphics/SVGImage.h</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImageForContainercpp">trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3compositingbackgroundblendmodedataurisvgimageexpectedhtml">trunk/LayoutTests/css3/compositing/background-blend-mode-data-uri-svg-image-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingbackgroundblendmodedataurisvgimagehtml">trunk/LayoutTests/css3/compositing/background-blend-mode-data-uri-svg-image.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161963 => 161964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-14 15:35:49 UTC (rev 161963)
+++ trunk/LayoutTests/ChangeLog 2014-01-14 15:38:26 UTC (rev 161964)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-14 Mihai Tica <mitica@adobe.com>
+
+ Background-blend-mode doesn't work for an element with an
+ SVG image as background and border-style or padding set.
+ https://bugs.webkit.org/show_bug.cgi?id=118894
+
+ Reviewed by Dirk Schulze.
+
+ * css3/compositing/background-blend-mode-data-uri-svg-image-expected.html: Added.
+ * css3/compositing/background-blend-mode-data-uri-svg-image.html: Added.
+
</ins><span class="cx"> 2014-01-14 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Test dynamic change of position for fixed element in named flow
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingbackgroundblendmodedataurisvgimageexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/background-blend-mode-data-uri-svg-image-expected.html (0 => 161964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/background-blend-mode-data-uri-svg-image-expected.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/background-blend-mode-data-uri-svg-image-expected.html 2014-01-14 15:38:26 UTC (rev 161964)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE HTML>
+
+<style>
+ div {
+ border: 5px navy;
+ border-style: dotted double;
+ background: url('data:image/svg+xml;utf8, \
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 100 100"> \
+ <circle cx="50" cy="50" r="40" fill="#0F0"/> \
+ </svg>'
+ ), #FF0;
+ width: 130px;
+ height: 130px;
+ }
+</style>
+
+<!-- This file should contain a green svg circle on top of a solid color yellow background. The container should have a visible border. -->
+
+<div></div>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingbackgroundblendmodedataurisvgimagehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/background-blend-mode-data-uri-svg-image.html (0 => 161964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/background-blend-mode-data-uri-svg-image.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/background-blend-mode-data-uri-svg-image.html 2014-01-14 15:38:26 UTC (rev 161964)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE HTML>
+
+<style>
+ div {
+ border: 5px navy;
+ border-style: dotted double;
+ background: url('data:image/svg+xml;utf8, \
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 100 100"> \
+ <circle cx="50" cy="50" r="40" fill="#F00"/> \
+ </svg>'
+ ), #FF0;
+ width: 130px;
+ height: 130px;
+ -webkit-background-blend-mode: difference, normal
+ }
+</style>
+
+<!-- This file should contain a green svg circle on top of a solid color yellow background. The container should have a visible border. -->
+
+<div></div>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161963 => 161964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-14 15:35:49 UTC (rev 161963)
+++ trunk/Source/WebCore/ChangeLog 2014-01-14 15:38:26 UTC (rev 161964)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-14 Mihai Tica <mitica@adobe.com>
+
+ Background-blend-mode doesn't work for an element with an
+ SVG image as background and border-style or padding set.
+ The problem consisted in the drawing path using the default
+ blending parameter at all times.
+ https://bugs.webkit.org/show_bug.cgi?id=118894
+
+ Reviewed by Dirk Schulze.
+
+ Test: css3/compositing/background-blend-mode-data-uri-svg-image.html
+
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::drawPatternForContainer): Pass blendMode to Image::drawPattern.
+ * svg/graphics/SVGImage.h: Add a blendMode parameter to drawPatternForContainer.
+ * svg/graphics/SVGImageForContainer.cpp:
+ (WebCore::SVGImageForContainer::drawPattern): Pass blendMode to drawPatternForContainer call.
+
</ins><span class="cx"> 2014-01-14 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove accidentally added PLATFORM(QT) from Source/WebCore/editing/EditorCommand.cpp after r161638
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (161963 => 161964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2014-01-14 15:35:49 UTC (rev 161963)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2014-01-14 15:38:26 UTC (rev 161964)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void SVGImage::drawPatternForContainer(GraphicsContext* context, const FloatSize containerSize, float zoom, const FloatRect& srcRect,
</span><del>- const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect)
</del><ins>+ const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace colorSpace, CompositeOperator compositeOp, BlendMode blendMode, const FloatRect& dstRect)
</ins><span class="cx"> {
</span><span class="cx"> FloatRect zoomedContainerRect = FloatRect(FloatPoint(), containerSize);
</span><span class="cx"> zoomedContainerRect.scale(zoom);
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> unscaledPatternTransform.scale(1 / imageBufferScale.width(), 1 / imageBufferScale.height());
</span><span class="cx">
</span><span class="cx"> context->setDrawLuminanceMask(false);
</span><del>- image->drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, colorSpace, compositeOp, dstRect);
</del><ins>+ image->drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, colorSpace, compositeOp, dstRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.h (161963 => 161964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.h 2014-01-14 15:35:49 UTC (rev 161963)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.h 2014-01-14 15:38:26 UTC (rev 161964)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRect& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) OVERRIDE;
</span><span class="cx"> void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode);
</span><span class="cx"> void drawPatternForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const AffineTransform&, const FloatPoint&, ColorSpace,
</span><del>- CompositeOperator, const FloatRect&);
</del><ins>+ CompositeOperator, BlendMode, const FloatRect&);
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<SVGImageChromeClient> m_chromeClient;
</span><span class="cx"> std::unique_ptr<Page> m_page;
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageForContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp (161963 => 161964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp 2014-01-14 15:35:49 UTC (rev 161963)
+++ trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp 2014-01-14 15:38:26 UTC (rev 161964)
</span><span class="lines">@@ -43,10 +43,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGImageForContainer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode)
</del><ins>+ const FloatPoint& phase, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> m_image->setSpaceSize(spaceSize());
</span><del>- m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, patternTransform, phase, colorSpace, compositeOp, dstRect);
</del><ins>+ m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, patternTransform, phase, colorSpace, compositeOp, blendMode, dstRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassNativeImagePtr SVGImageForContainer::nativeImageForCurrentFrame()
</span></span></pre>
</div>
</div>
</body>
</html>