<!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>[269453] 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/269453">269453</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2020-11-05 11:17:16 -0800 (Thu, 05 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Clean up Source/WebCore/platform/graphics/DashArray.h
https://bugs.webkit.org/show_bug.cgi?id=218619

Reviewed by Simon Fraser.

Attempting to #include <WebCore/DisplayList.h> in API tests currently results in a compilation error when
parsing `DashArray.h`, due to the `CGFloat` type being unknown. Fix this by including `CoreGraphics.h` if
`USE(CG)` is defined.

* platform/graphics/DashArray.h:

Also do some more cleanup around this file:
- Use `#pragma once` instead of `#define`-based header guards.
- Use `using` instead of `typedef`
- Add a missing `namespace WebCore` around this file

* platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h: Add WebCore namespaces for `DashArray`.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsDashArrayh">trunk/Source/WebCore/platform/graphics/DashArray.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsnicosiacairoNicosiaCairoOperationRecorderh">trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (269452 => 269453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-05 19:12:23 UTC (rev 269452)
+++ trunk/Source/WebCore/ChangeLog      2020-11-05 19:17:16 UTC (rev 269453)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2020-11-05  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Clean up Source/WebCore/platform/graphics/DashArray.h
+        https://bugs.webkit.org/show_bug.cgi?id=218619
+
+        Reviewed by Simon Fraser.
+
+        Attempting to #include <WebCore/DisplayList.h> in API tests currently results in a compilation error when
+        parsing `DashArray.h`, due to the `CGFloat` type being unknown. Fix this by including `CoreGraphics.h` if
+        `USE(CG)` is defined.
+
+        * platform/graphics/DashArray.h:
+
+        Also do some more cleanup around this file:
+        - Use `#pragma once` instead of `#define`-based header guards.
+        - Use `using` instead of `typedef`
+        - Add a missing `namespace WebCore` around this file
+
+        * platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h: Add WebCore namespaces for `DashArray`.
+
</ins><span class="cx"> 2020-11-05  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         <input disabled> does not fire click events after dispatchEvent
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsDashArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/DashArray.h (269452 => 269453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/DashArray.h       2020-11-05 19:12:23 UTC (rev 269452)
+++ trunk/Source/WebCore/platform/graphics/DashArray.h  2020-11-05 19:17:16 UTC (rev 269453)
</span><span class="lines">@@ -23,19 +23,24 @@
</span><span class="cx">  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#ifndef DashArray_h
-#define DashArray_h
</del><ins>+#pragma once
</ins><span class="cx"> 
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> 
</span><span class="cx"> #if USE(CG)
</span><del>-typedef CGFloat DashArrayElement;
</del><ins>+#include <CoreGraphics/CoreGraphics.h>
+#endif
+
+namespace WebCore {
+
+#if USE(CG)
+using DashArrayElement = CGFloat;
</ins><span class="cx"> #elif USE(CAIRO)
</span><del>-typedef double DashArrayElement;
</del><ins>+using DashArrayElement = double;
</ins><span class="cx"> #else
</span><del>-typedef float DashArrayElement;
</del><ins>+using DashArrayElement = float;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-typedef Vector<DashArrayElement> DashArray;
</del><ins>+using DashArray = Vector<DashArrayElement>;
</ins><span class="cx"> 
</span><del>-#endif // DashArray_h
</del><ins>+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsnicosiacairoNicosiaCairoOperationRecorderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h (269452 => 269453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h     2020-11-05 19:12:23 UTC (rev 269452)
+++ trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h        2020-11-05 19:17:16 UTC (rev 269453)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">     void clearShadow() override;
</span><span class="cx"> 
</span><span class="cx">     void setLineCap(WebCore::LineCap) override;
</span><del>-    void setLineDash(const DashArray&, float) override;
</del><ins>+    void setLineDash(const WebCore::DashArray&, float) override;
</ins><span class="cx">     void setLineJoin(WebCore::LineJoin) override;
</span><span class="cx">     void setMiterLimit(float) override;
</span><span class="cx"> 
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> 
</span><span class="cx">     void drawRect(const WebCore::FloatRect&, float) override;
</span><span class="cx">     void drawLine(const WebCore::FloatPoint&, const WebCore::FloatPoint&) override;
</span><del>-    void drawLinesForText(const WebCore::FloatPoint&, float thickness, const DashArray&, bool, bool) override;
</del><ins>+    void drawLinesForText(const WebCore::FloatPoint&, float thickness, const WebCore::DashArray&, bool, bool) override;
</ins><span class="cx">     void drawDotsForDocumentMarker(const WebCore::FloatRect&, WebCore::DocumentMarkerLineStyle) override;
</span><span class="cx">     void drawEllipse(const WebCore::FloatRect&) override;
</span><span class="cx">     void drawPath(const WebCore::Path&) override;
</span></span></pre>
</div>
</div>

</body>
</html>