<!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>[224743] 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/224743">224743</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2017-11-12 23:32:03 -0800 (Sun, 12 Nov 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Cairo] Move line, miter operations in GraphicsContextCairo to CairoOperations
https://bugs.webkit.org/show_bug.cgi?id=179597

Reviewed by Carlos Garcia Campos.

Move operations that adjust line cap, line dash, line join and miter
limit to the CairoOperations file. This limits operations to only work
with a PlatformContextCairo object, along with any required parameter,
and will help with future work in this area.

No new tests -- no change in behavior.

* platform/graphics/cairo/CairoOperations.cpp:
(WebCore::Cairo::setLineCap):
(WebCore::Cairo::setLineDash):
(WebCore::Cairo::setLineJoin):
(WebCore::Cairo::setMiterLimit):
* platform/graphics/cairo/CairoOperations.h:
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::setLineCap):
(WebCore::GraphicsContext::setLineDash):
(WebCore::GraphicsContext::setLineJoin):
(WebCore::GraphicsContext::setMiterLimit):
(WebCore::isDashArrayAllZero): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoCairoOperationscpp">trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoCairoOperationsh">trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.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 (224742 => 224743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-11-13 06:54:44 UTC (rev 224742)
+++ trunk/Source/WebCore/ChangeLog      2017-11-13 07:32:03 UTC (rev 224743)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2017-11-12  Zan Dobersek  <zdobersek@igalia.com>
+
+        [Cairo] Move line, miter operations in GraphicsContextCairo to CairoOperations
+        https://bugs.webkit.org/show_bug.cgi?id=179597
+
+        Reviewed by Carlos Garcia Campos.
+
+        Move operations that adjust line cap, line dash, line join and miter
+        limit to the CairoOperations file. This limits operations to only work
+        with a PlatformContextCairo object, along with any required parameter,
+        and will help with future work in this area.
+
+        No new tests -- no change in behavior.
+
+        * platform/graphics/cairo/CairoOperations.cpp:
+        (WebCore::Cairo::setLineCap):
+        (WebCore::Cairo::setLineDash):
+        (WebCore::Cairo::setLineJoin):
+        (WebCore::Cairo::setMiterLimit):
+        * platform/graphics/cairo/CairoOperations.h:
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::setLineCap):
+        (WebCore::GraphicsContext::setLineDash):
+        (WebCore::GraphicsContext::setLineJoin):
+        (WebCore::GraphicsContext::setMiterLimit):
+        (WebCore::isDashArrayAllZero): Deleted.
+
</ins><span class="cx"> 2017-11-12  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Service Workers] Activate algorithm says terminate the active worker if it exists
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoCairoOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.cpp (224742 => 224743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.cpp 2017-11-13 06:54:44 UTC (rev 224742)
+++ trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.cpp    2017-11-13 07:32:03 UTC (rev 224743)
</span><span class="lines">@@ -45,6 +45,53 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace Cairo {
</span><span class="cx"> 
</span><ins>+void setLineCap(PlatformContextCairo& platformContext, LineCap lineCap)
+{
+    cairo_line_cap_t cairoCap;
+    switch (lineCap) {
+    case ButtCap:
+        cairoCap = CAIRO_LINE_CAP_BUTT;
+        break;
+    case RoundCap:
+        cairoCap = CAIRO_LINE_CAP_ROUND;
+        break;
+    case SquareCap:
+        cairoCap = CAIRO_LINE_CAP_SQUARE;
+        break;
+    }
+    cairo_set_line_cap(platformContext.cr(), cairoCap);
+}
+
+void setLineDash(PlatformContextCairo& platformContext, const DashArray& dashes, float dashOffset)
+{
+    if (std::all_of(dashes.begin(), dashes.end(), [](auto& dash) { return !dash; }))
+        cairo_set_dash(platformContext.cr(), 0, 0, 0);
+    else
+        cairo_set_dash(platformContext.cr(), dashes.data(), dashes.size(), dashOffset);
+}
+
+void setLineJoin(PlatformContextCairo& platformContext, LineJoin lineJoin)
+{
+    cairo_line_join_t cairoJoin;
+    switch (lineJoin) {
+    case MiterJoin:
+        cairoJoin = CAIRO_LINE_JOIN_MITER;
+        break;
+    case RoundJoin:
+        cairoJoin = CAIRO_LINE_JOIN_ROUND;
+        break;
+    case BevelJoin:
+        cairoJoin = CAIRO_LINE_JOIN_BEVEL;
+        break;
+    }
+    cairo_set_line_join(platformContext.cr(), cairoJoin);
+}
+
+void setMiterLimit(PlatformContextCairo& platformContext, float miterLimit)
+{
+    cairo_set_miter_limit(platformContext.cr(), miterLimit);
+}
+
</ins><span class="cx"> void clip(PlatformContextCairo& platformContext, const FloatRect& rect)
</span><span class="cx"> {
</span><span class="cx">     cairo_t* cr = platformContext.cr();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoCairoOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.h (224742 => 224743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.h   2017-11-13 06:54:44 UTC (rev 224742)
+++ trunk/Source/WebCore/platform/graphics/cairo/CairoOperations.h      2017-11-13 07:32:03 UTC (rev 224743)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> 
</span><ins>+#include "DashArray.h"
</ins><span class="cx"> #include "GraphicsTypes.h"
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -45,6 +46,11 @@
</span><span class="cx"> 
</span><span class="cx"> namespace Cairo {
</span><span class="cx"> 
</span><ins>+void setLineCap(PlatformContextCairo&, LineCap);
+void setLineDash(PlatformContextCairo&, const DashArray&, float);
+void setLineJoin(PlatformContextCairo&, LineJoin);
+void setMiterLimit(PlatformContextCairo&, float);
+
</ins><span class="cx"> void clip(PlatformContextCairo&, const FloatRect&);
</span><span class="cx"> void clipOut(PlatformContextCairo&, const FloatRect&);
</span><span class="cx"> void clipOut(PlatformContextCairo&, const Path&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (224742 => 224743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp    2017-11-13 06:54:44 UTC (rev 224742)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp       2017-11-13 07:32:03 UTC (rev 224743)
</span><span class="lines">@@ -930,30 +930,10 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    cairo_line_cap_t cairoCap = CAIRO_LINE_CAP_BUTT;
-    switch (lineCap) {
-    case ButtCap:
-        // no-op
-        break;
-    case RoundCap:
-        cairoCap = CAIRO_LINE_CAP_ROUND;
-        break;
-    case SquareCap:
-        cairoCap = CAIRO_LINE_CAP_SQUARE;
-        break;
-    }
-    cairo_set_line_cap(platformContext()->cr(), cairoCap);
</del><ins>+    ASSERT(hasPlatformContext());
+    Cairo::setLineCap(*platformContext(), lineCap);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-static inline bool isDashArrayAllZero(const DashArray& dashes)
-{
-    for (auto& dash : dashes) {
-        if (dash)
-            return false;
-    }
-    return true;
-}
-
</del><span class="cx"> void GraphicsContext::setLineDash(const DashArray& dashes, float dashOffset)
</span><span class="cx"> {
</span><span class="cx">     if (paintingDisabled())
</span><span class="lines">@@ -964,10 +944,8 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (isDashArrayAllZero(dashes))
-        cairo_set_dash(platformContext()->cr(), 0, 0, 0);
-    else
-        cairo_set_dash(platformContext()->cr(), dashes.data(), dashes.size(), dashOffset);
</del><ins>+    ASSERT(hasPlatformContext());
+    Cairo::setLineDash(*platformContext(), dashes, dashOffset);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void GraphicsContext::setLineJoin(LineJoin lineJoin)
</span><span class="lines">@@ -980,19 +958,8 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    cairo_line_join_t cairoJoin = CAIRO_LINE_JOIN_MITER;
-    switch (lineJoin) {
-    case MiterJoin:
-        // no-op
-        break;
-    case RoundJoin:
-        cairoJoin = CAIRO_LINE_JOIN_ROUND;
-        break;
-    case BevelJoin:
-        cairoJoin = CAIRO_LINE_JOIN_BEVEL;
-        break;
-    }
-    cairo_set_line_join(platformContext()->cr(), cairoJoin);
</del><ins>+    ASSERT(hasPlatformContext());
+    Cairo::setLineJoin(*platformContext(), lineJoin);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void GraphicsContext::setMiterLimit(float miter)
</span><span class="lines">@@ -1006,7 +973,8 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    cairo_set_miter_limit(platformContext()->cr(), miter);
</del><ins>+    ASSERT(hasPlatformContext());
+    Cairo::setMiterLimit(*platformContext(), miter);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void GraphicsContext::setPlatformAlpha(float alpha)
</span></span></pre>
</div>
</div>

</body>
</html>