<!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>[214100] trunk/Source/WebCore</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/214100">214100</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-17 01:22:57 -0700 (Fri, 17 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cairo] Handle the blend mode in GraphicsContext::drawPattern
https://bugs.webkit.org/show_bug.cgi?id=169746
Reviewed by Žan Doberšek.
We are not taking into account the blend mode when passing the cairo operator to drawPatternToCairoContext().
This is based on patch by Žan Doberšek, just adding the toCairoOperator changes to make it easier to handle
it. Instead of checking everywhere if blend mode is Normal to decide whether to use toCairoOperator with
CompositeOperator or BlendMode, there's no a single toCairoOperator that receives both parameters, but BlendMode
is optional and defaults to Normal.
* platform/graphics/cairo/CairoUtilities.cpp:
(WebCore::toCairoCompositeOperator):
(WebCore::toCairoOperator):
* platform/graphics/cairo/CairoUtilities.h:
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::setPlatformCompositeOperation):
(WebCore::GraphicsContext::drawPattern):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoCairoUtilitiescpp">trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoCairoUtilitiesh">trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214099 => 214100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-17 05:29:51 UTC (rev 214099)
+++ trunk/Source/WebCore/ChangeLog 2017-03-17 08:22:57 UTC (rev 214100)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-03-17 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [Cairo] Handle the blend mode in GraphicsContext::drawPattern
+ https://bugs.webkit.org/show_bug.cgi?id=169746
+
+ Reviewed by Žan Doberšek.
+
+ We are not taking into account the blend mode when passing the cairo operator to drawPatternToCairoContext().
+ This is based on patch by Žan Doberšek, just adding the toCairoOperator changes to make it easier to handle
+ it. Instead of checking everywhere if blend mode is Normal to decide whether to use toCairoOperator with
+ CompositeOperator or BlendMode, there's no a single toCairoOperator that receives both parameters, but BlendMode
+ is optional and defaults to Normal.
+
+ * platform/graphics/cairo/CairoUtilities.cpp:
+ (WebCore::toCairoCompositeOperator):
+ (WebCore::toCairoOperator):
+ * platform/graphics/cairo/CairoUtilities.h:
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::setPlatformCompositeOperation):
+ (WebCore::GraphicsContext::drawPattern):
+
</ins><span class="cx"> 2017-03-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix GTK build.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoCairoUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp (214099 => 214100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2017-03-17 05:29:51 UTC (rev 214099)
+++ trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2017-03-17 08:22:57 UTC (rev 214100)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-cairo_operator_t toCairoOperator(CompositeOperator op)
</del><ins>+static cairo_operator_t toCairoCompositeOperator(CompositeOperator op)
</ins><span class="cx"> {
</span><span class="cx"> switch (op) {
</span><span class="cx"> case CompositeClear:
</span><span class="lines">@@ -143,11 +143,12 @@
</span><span class="cx"> return CAIRO_OPERATOR_SOURCE;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-cairo_operator_t toCairoOperator(BlendMode blendOp)
</del><ins>+
+cairo_operator_t toCairoOperator(CompositeOperator op, BlendMode blendOp)
</ins><span class="cx"> {
</span><span class="cx"> switch (blendOp) {
</span><span class="cx"> case BlendModeNormal:
</span><del>- return CAIRO_OPERATOR_OVER;
</del><ins>+ return toCairoCompositeOperator(op);
</ins><span class="cx"> case BlendModeMultiply:
</span><span class="cx"> return CAIRO_OPERATOR_MULTIPLY;
</span><span class="cx"> case BlendModeScreen:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoCairoUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h (214099 => 214100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h 2017-03-17 05:29:51 UTC (rev 214099)
+++ trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h 2017-03-17 08:22:57 UTC (rev 214100)
</span><span class="lines">@@ -79,8 +79,7 @@
</span><span class="cx"> void setPathOnCairoContext(cairo_t* to, cairo_t* from);
</span><span class="cx"> void appendWebCorePathToCairoContext(cairo_t* context, const Path& path);
</span><span class="cx"> void appendRegionToCairoContext(cairo_t*, const cairo_region_t*);
</span><del>-cairo_operator_t toCairoOperator(CompositeOperator op);
-cairo_operator_t toCairoOperator(BlendMode blendOp);
</del><ins>+cairo_operator_t toCairoOperator(CompositeOperator, BlendMode = BlendModeNormal);
</ins><span class="cx"> void drawPatternToCairoContext(cairo_t* cr, cairo_surface_t* image, const IntSize& imageSize, const FloatRect& tileRect,
</span><span class="cx"> const AffineTransform& patternTransform, const FloatPoint& phase, cairo_operator_t op, const FloatRect& destRect);
</span><span class="cx"> RefPtr<cairo_surface_t> copyCairoImageSurface(cairo_surface_t*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (214099 => 214100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2017-03-17 05:29:51 UTC (rev 214099)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2017-03-17 08:22:57 UTC (rev 214100)
</span><span class="lines">@@ -1036,13 +1036,7 @@
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- cairo_operator_t cairo_op;
- if (blendOp == BlendModeNormal)
- cairo_op = toCairoOperator(op);
- else
- cairo_op = toCairoOperator(blendOp);
-
- cairo_set_operator(platformContext()->cr(), cairo_op);
</del><ins>+ cairo_set_operator(platformContext()->cr(), toCairoOperator(op, blendOp));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::canvasClip(const Path& path, WindRule windRule)
</span><span class="lines">@@ -1183,7 +1177,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> cairo_t* cr = platformContext()->cr();
</span><del>- drawPatternToCairoContext(cr, surface.get(), IntSize(image.size()), tileRect, patternTransform, phase, toCairoOperator(op), destRect);
</del><ins>+ drawPatternToCairoContext(cr, surface.get(), IntSize(image.size()), tileRect, patternTransform, phase, toCairoOperator(op, blendMode), destRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setPlatformShouldAntialias(bool enable)
</span></span></pre>
</div>
</div>
</body>
</html>