<!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>[162442] 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/162442">162442</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-21 08:36:50 -0800 (Tue, 21 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp">trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradientImagecpp">trunk/Source/WebCore/platform/graphics/GradientImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferh">trunk/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceImageBufferWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3compositingbackgroundblendmodetiledlayersexpectedhtml">trunk/LayoutTests/css3/compositing/background-blend-mode-tiled-layers-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingbackgroundblendmodetiledlayershtml">trunk/LayoutTests/css3/compositing/background-blend-mode-tiled-layers.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162441 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-21 14:57:45 UTC (rev 162441)
+++ trunk/LayoutTests/ChangeLog 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-01-21 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix SVG animations which set rx or ry attributes
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingbackgroundblendmodetiledlayersexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/background-blend-mode-tiled-layers-expected.html (0 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/background-blend-mode-tiled-layers-expected.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/background-blend-mode-tiled-layers-expected.html 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE HTML>
+
+<!-- Test background blend mode with several tiled layers. Test passes if you can see 6 lime squares. -->
+
+<style>
+ div {
+ margin: 5px;
+ width: 100px;
+ height: 100px;
+ background: lime;
+ float: left;
+ }
+</style>
+
+<div></div>
+<div></div>
+<div></div>
+<div></div>
+<div></div>
+<div></div>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingbackgroundblendmodetiledlayershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/background-blend-mode-tiled-layers.html (0 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/background-blend-mode-tiled-layers.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/background-blend-mode-tiled-layers.html 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!DOCTYPE HTML>
+
+<!-- Test background blend mode with several tiled layers. Test passes if you can see 6 lime squares. -->
+
+<style>
+ div {
+ margin: 5px;
+ width: 100px;
+ height: 100px;
+ -webkit-background-blend-mode: difference, normal;
+ float: left;
+ }
+
+ .tiledSVG {
+ background: url('data:image/svg+xml;utf8, \
+ <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100"> \
+ <rect width="100" height="100" fill="#F00"/> \
+ </svg>'
+ ) 0 0 /50% 50%, #FF0;
+ }
+
+ .tiledGradient {
+ background: linear-gradient(to right, #F00 0%, #F00 100%) 0 0 /50% 50%, #FF0;
+ }
+
+ .tiledCrossfadeImage {
+ background: -webkit-cross-fade(url('data:image/svg+xml;utf8, \
+ <svg xmlns="http://www.w3.org/2000/svg" width="100px" height="100px"> \
+ <rect width="100" height="100" fill="#F00"/> \
+ </svg>'
+ ), url('data:image/svg+xml;utf8, \
+ <svg xmlns="http://www.w3.org/2000/svg" width="100px" height="100px"> \
+ <rect width="100" height="100" fill="#F00"/> \
+ </svg>'
+ ), 100%) 0 0 /50% 50%, #FF0;
+ }
+
+ .accelerated {
+ -webkit-transform: translateZ(0);
+ }
+
+</style>
+
+<script type="text/javascript">
+ if (window.testRunner)
+ window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
+</script>
+
+<div class="tiledSVG"></div>
+<div class="tiledSVG accelerated"></div>
+
+<div class="tiledGradient"></div>
+<div class="tiledGradient accelerated"></div>
+
+<div class="tiledCrossfadeImage"></div>
+<div class="tiledCrossfadeImage accelerated"></div>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (162441 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2014-01-21 14:57:45 UTC (rev 162441)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -499,6 +499,7 @@
</span><span class="cx"> webkit.org/b/99200 css3/compositing/blend-mode-simple.html [ Skip ]
</span><span class="cx"> webkit.org/b/99200 css3/compositing/blend-mode-should-not-have-compositing-layer.html [ Skip ]
</span><span class="cx"> webkit.org/b/118894 css3/compositing/background-blend-mode-data-uri-svg-image.html [ Skip ]
</span><ins>+webkit.org/b/126888 css3/compositing/background-blend-mode-tiled-layers.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # No concept of secure text input
</span><span class="cx"> editing/secure-input [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (162441 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-01-21 14:57:45 UTC (rev 162441)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -617,6 +617,8 @@
</span><span class="cx">
</span><span class="cx"> # Blend mode result is slightly different than the applied formula.
</span><span class="cx"> css3/compositing/background-blend-mode-data-uri-svg-image.html [ ImageOnlyFailure Pass ]
</span><ins>+css3/compositing/background-blend-mode-tiled-layers.html [ ImageOnlyFailure Pass ]
+css3/compositing/background-blend-mode-crossfade-image.html [ ImageOnlyFailure Pass ]
</ins><span class="cx">
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=110871
</span><span class="cx"> compositing/overlap-blending/reflection-opacity-huge.html
</span><span class="lines">@@ -661,9 +663,6 @@
</span><span class="cx"> css3/filters/composited-during-transition-layertree.html
</span><span class="cx"> webkit.org/b/95622 css3/filters/composited-during-animation-layertree.html [ Pass Failure ]
</span><span class="cx">
</span><del>-# Blending result is slightly different than the formula.
-webkit.org/b/126887 css3/compositing/background-blend-mode-crossfade-image.html [ ImageOnlyFailure Pass ]
-
</del><span class="cx"> # --- Custom Filters ---
</span><span class="cx"> # The following 5 tests are currently skipped on Mac for slight color differences,
</span><span class="cx"> # please see the relevant bug: http://webkit.org/b/107487
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162441 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-21 14:57:45 UTC (rev 162441)
+++ trunk/Source/WebCore/ChangeLog 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-01-21 Gurpreet Kaur <k.gurpreet@samsung.com>
</span><span class="cx">
</span><span class="cx"> The WebCore.vcxproj.filters doesnot apply
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp (162441 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2014-01-21 14:57:45 UTC (rev 162441)
+++ trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> drawCrossfade(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CrossfadeGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode)
</del><ins>+void CrossfadeGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, context->isAcceleratedContext() ? Accelerated : Unaccelerated);
</span><span class="cx"> if (!imageBuffer)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> drawCrossfade(graphicsContext);
</span><span class="cx">
</span><span class="cx"> // Tile the image buffer into the context.
</span><del>- imageBuffer->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, compositeOp, dstRect);
</del><ins>+ imageBuffer->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, compositeOp, dstRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradientImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GradientImage.cpp (162441 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GradientImage.cpp 2014-01-21 14:57:45 UTC (rev 162441)
+++ trunk/Source/WebCore/platform/graphics/GradientImage.cpp 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GradientImage::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& destRect, BlendMode)
</del><ins>+ const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> // Allow the generator to provide visually-equivalent tiling parameters for better performance.
</span><span class="cx"> IntSize adjustedSize = size();
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> destContext->setDrawLuminanceMask(false);
</span><span class="cx">
</span><span class="cx"> // Tile the image buffer into the context.
</span><del>- m_cachedImageBuffer->drawPattern(destContext, adjustedSrcRect, adjustedPatternCTM, phase, styleColorSpace, compositeOp, destRect);
</del><ins>+ m_cachedImageBuffer->drawPattern(destContext, adjustedSrcRect, adjustedPatternCTM, phase, styleColorSpace, compositeOp, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (162441 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2014-01-21 14:57:45 UTC (rev 162441)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> void clip(GraphicsContext*, const FloatRect&) const;
</span><span class="cx">
</span><span class="cx"> void draw(GraphicsContext*, ColorSpace, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, bool useLowQualityScale = false);
</span><del>- void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
</del><ins>+ void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</ins><span class="cx">
</span><span class="cx"> inline void genericConvertToLuminanceMask();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (162441 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2014-01-21 14:57:45 UTC (rev 162441)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
</del><ins>+ const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Image> image = copyImage(DontCopyBackingStore);
</span><span class="cx"> image->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, op, destRect);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (162441 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2014-01-21 14:57:45 UTC (rev 162441)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> destContext->drawNativeImage(image.get(), m_data.m_backingStoreSize, colorSpace, destRect, adjustedSrcRect, 1, op, blendMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageBuffer::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
</del><ins>+void ImageBuffer::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> FloatRect adjustedSrcRect = srcRect;
</span><span class="cx"> adjustedSrcRect.scale(m_resolutionScale, m_resolutionScale);
</span><span class="lines">@@ -315,14 +315,14 @@
</span><span class="cx"> if (!m_context->isAcceleratedContext()) {
</span><span class="cx"> if (destContext == m_context || destContext->isAcceleratedContext()) {
</span><span class="cx"> RefPtr<Image> copy = copyImage(CopyBackingStore); // Drawing into our own buffer, need to deep copy.
</span><del>- copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect);
</del><ins>+ copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect, blendMode);
</ins><span class="cx"> } else {
</span><span class="cx"> RefPtr<Image> imageForRendering = copyImage(DontCopyBackingStore);
</span><del>- imageForRendering->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect);
</del><ins>+ imageForRendering->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> RefPtr<Image> copy = copyImage(CopyBackingStore);
</span><del>- copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect);
</del><ins>+ copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceImageBufferWinCEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp (162441 => 162442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp 2014-01-21 14:57:45 UTC (rev 162441)
+++ trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp 2014-01-21 16:36:50 UTC (rev 162442)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BufferedImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRectIn, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect)
</del><ins>+ const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
</ins><span class="cx"> {
</span><span class="cx"> m_data->m_bitmap->drawPattern(ctxt, tileRectIn, patternTransform, phase, styleColorSpace, op, destRect, size());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>