<!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>[167451] 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/167451">167451</a></dd>
<dt>Author</dt> <dd>krit@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-17 13:32:19 -0700 (Thu, 17 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove CANVAS_PATH where possible
https://bugs.webkit.org/show_bug.cgi?id=131788
Reviewed by Dean Jackson.
Since Firefox and Chrome ship the same interoperable subset of Path2D soon,
it is time to remove CANVAS_PATH where possible.
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::clip):
(WebCore::CanvasRenderingContext2D::isPointInStroke):
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/CanvasRenderingContext2D.idl:
* html/canvas/DOMPath.h:
* html/canvas/DOMPath.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasDOMPathh">trunk/Source/WebCore/html/canvas/DOMPath.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasDOMPathidl">trunk/Source/WebCore/html/canvas/DOMPath.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167450 => 167451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-17 20:31:13 UTC (rev 167450)
+++ trunk/Source/WebCore/ChangeLog 2014-04-17 20:32:19 UTC (rev 167451)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-17 Dirk Schulze <krit@webkit.org>
+
+ Remove CANVAS_PATH where possible
+ https://bugs.webkit.org/show_bug.cgi?id=131788
+
+ Reviewed by Dean Jackson.
+
+ Since Firefox and Chrome ship the same interoperable subset of Path2D soon,
+ it is time to remove CANVAS_PATH where possible.
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::clip):
+ (WebCore::CanvasRenderingContext2D::isPointInStroke):
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/CanvasRenderingContext2D.idl:
+ * html/canvas/DOMPath.h:
+ * html/canvas/DOMPath.idl:
+
</ins><span class="cx"> 2014-04-17 Brendan Long <b.long@cablelabs.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Store TrackPrivateBaseGStreamer's label and language as AtomicStrings
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (167450 => 167451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-04-17 20:31:13 UTC (rev 167450)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-04-17 20:32:19 UTC (rev 167451)
</span><span class="lines">@@ -903,7 +903,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CANVAS_PATH)
</del><span class="cx"> void CanvasRenderingContext2D::fill(DOMPath* path, const String& windingRuleString)
</span><span class="cx"> {
</span><span class="cx"> fillInternal(path->path(), windingRuleString);
</span><span class="lines">@@ -918,7 +917,6 @@
</span><span class="cx"> {
</span><span class="cx"> clipInternal(path->path(), windingRuleString);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void CanvasRenderingContext2D::fillInternal(const Path& path, const String& windingRuleString)
</span><span class="cx"> {
</span><span class="lines">@@ -1030,7 +1028,6 @@
</span><span class="cx"> return isPointInStrokeInternal(m_path, x, y);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CANVAS_PATH)
</del><span class="cx"> bool CanvasRenderingContext2D::isPointInPath(DOMPath* path, const float x, const float y, const String& windingRuleString)
</span><span class="cx"> {
</span><span class="cx"> return isPointInPathInternal(path->path(), x, y, windingRuleString);
</span><span class="lines">@@ -1040,7 +1037,6 @@
</span><span class="cx"> {
</span><span class="cx"> return isPointInStrokeInternal(path->path(), x, y);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool CanvasRenderingContext2D::isPointInPathInternal(const Path& path, float x, float y, const String& windingRuleString)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (167450 => 167451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2014-04-17 20:31:13 UTC (rev 167450)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2014-04-17 20:32:19 UTC (rev 167451)
</span><span class="lines">@@ -135,19 +135,15 @@
</span><span class="cx"> void stroke();
</span><span class="cx"> void clip(const String& winding = "nonzero");
</span><span class="cx">
</span><del>-#if ENABLE(CANVAS_PATH)
</del><span class="cx"> void fill(DOMPath*, const String& winding = "nonzero");
</span><span class="cx"> void stroke(DOMPath*);
</span><span class="cx"> void clip(DOMPath*, const String& winding = "nonzero");
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool isPointInPath(const float x, const float y, const String& winding = "nonzero");
</span><span class="cx"> bool isPointInStroke(const float x, const float y);
</span><span class="cx">
</span><del>-#if ENABLE(CANVAS_PATH)
</del><span class="cx"> bool isPointInPath(DOMPath*, const float x, const float y, const String& winding = "nonzero");
</span><span class="cx"> bool isPointInStroke(DOMPath*, const float x, const float y);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void clearRect(float x, float y, float width, float height);
</span><span class="cx"> void fillRect(float x, float y, float width, float height);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (167450 => 167451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2014-04-17 20:31:13 UTC (rev 167450)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2014-04-17 20:32:19 UTC (rev 167451)
</span><span class="lines">@@ -74,20 +74,16 @@
</span><span class="cx"> void rect(float x, float y, float width, float height);
</span><span class="cx"> [RaisesException] void arc(float x, float y, float radius, float startAngle, float endAngle, [Default=Undefined] optional boolean anticlockwise);
</span><span class="cx">
</span><del>-#if defined(ENABLE_CANVAS_PATH) && ENABLE_CANVAS_PATH
</del><span class="cx"> void fill(DOMPath path, optional CanvasWindingRule winding);
</span><span class="cx"> void stroke(DOMPath path);
</span><span class="cx"> void clip(DOMPath path, optional CanvasWindingRule winding);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void fill(optional CanvasWindingRule winding);
</span><span class="cx"> void stroke();
</span><span class="cx"> void clip(optional CanvasWindingRule winding);
</span><span class="cx">
</span><del>-#if defined(ENABLE_CANVAS_PATH) && ENABLE_CANVAS_PATH
</del><span class="cx"> boolean isPointInPath(DOMPath path, float x, float y, optional CanvasWindingRule winding);
</span><span class="cx"> boolean isPointInStroke(DOMPath path, float x, float y);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> boolean isPointInPath(float x, float y, optional CanvasWindingRule winding);
</span><span class="cx"> boolean isPointInStroke(float x, float y);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasDOMPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/DOMPath.h (167450 => 167451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/DOMPath.h 2014-04-17 20:31:13 UTC (rev 167450)
+++ trunk/Source/WebCore/html/canvas/DOMPath.h 2014-04-17 20:32:19 UTC (rev 167451)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #ifndef DOMPath_h
</span><span class="cx"> #define DOMPath_h
</span><span class="cx">
</span><del>-#if ENABLE(CANVAS_PATH)
-
</del><span class="cx"> #include "CanvasPathMethods.h"
</span><span class="cx"> #include "SVGMatrix.h"
</span><span class="cx"> #include "SVGPathUtilities.h"
</span><span class="lines">@@ -52,6 +50,7 @@
</span><span class="cx"> return create(path);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CANVAS_PATH)
</ins><span class="cx"> void addPath(const DOMPath* path) { addPath(path, AffineTransform()); }
</span><span class="cx"> void addPath(const DOMPath* path, const AffineTransform& transform)
</span><span class="cx"> {
</span><span class="lines">@@ -59,6 +58,7 @@
</span><span class="cx"> return;
</span><span class="cx"> m_path.addPath(path->path(), transform);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> const Path& path() const { return m_path; }
</span><span class="cx">
</span><span class="lines">@@ -68,7 +68,4 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> #endif
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasDOMPathidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/DOMPath.idl (167450 => 167451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/DOMPath.idl 2014-04-17 20:31:13 UTC (rev 167450)
+++ trunk/Source/WebCore/html/canvas/DOMPath.idl 2014-04-17 20:32:19 UTC (rev 167451)
</span><span class="lines">@@ -30,11 +30,12 @@
</span><span class="cx"> Constructor,
</span><span class="cx"> Constructor(DOMPath path),
</span><span class="cx"> Constructor(DOMString text),
</span><del>- Conditional=CANVAS_PATH,
</del><span class="cx"> InterfaceName=Path2D,
</span><span class="cx"> ] interface DOMPath {
</span><span class="cx">
</span><ins>+#if defined(ENABLE_CANVAS_PATH) && ENABLE_CANVAS_PATH
</ins><span class="cx"> void addPath(DOMPath? path, optional SVGMatrix? transform);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // FIXME: These methods should be shared with CanvasRenderingContext2D in the CanvasPathMethods interface.
</span><span class="cx"> void closePath();
</span></span></pre>
</div>
</div>
</body>
</html>