<!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>[195048] releases/WebKitGTK/webkit-2.10/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/195048">195048</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-14 05:29:39 -0800 (Thu, 14 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192787">r192787</a> - Use SVGTransform::SVGTransformType instead of an unsigned short
https://bugs.webkit.org/show_bug.cgi?id=151637

Reviewed by Brady Eidson.

Make 'type' more strongly typed.

* svg/SVGTransformable.cpp:
(WebCore::SVGTransformable::parseTransformValue):
(WebCore::parseAndSkipType):
(WebCore::SVGTransformable::parseTransformType):
(WebCore::SVGTransformable::parseTransformAttribute):
* svg/SVGTransformable.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoresvgSVGTransformablecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/SVGTransformable.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoresvgSVGTransformableh">releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/SVGTransformable.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195047 => 195048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2016-01-14 13:23:10 UTC (rev 195047)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2016-01-14 13:29:39 UTC (rev 195048)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-11-29  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Use SVGTransform::SVGTransformType instead of an unsigned short
+        https://bugs.webkit.org/show_bug.cgi?id=151637
+
+        Reviewed by Brady Eidson.
+
+        Make 'type' more strongly typed.
+
+        * svg/SVGTransformable.cpp:
+        (WebCore::SVGTransformable::parseTransformValue):
+        (WebCore::parseAndSkipType):
+        (WebCore::SVGTransformable::parseTransformType):
+        (WebCore::SVGTransformable::parseTransformAttribute):
+        * svg/SVGTransformable.h:
+
</ins><span class="cx"> 2015-11-27  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Do not use the WebCore garbage collector timer
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoresvgSVGTransformablecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/SVGTransformable.cpp (195047 => 195048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/SVGTransformable.cpp        2016-01-14 13:23:10 UTC (rev 195047)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/SVGTransformable.cpp        2016-01-14 13:29:39 UTC (rev 195048)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool SVGTransformable::parseTransformValue(unsigned type, const UChar*&amp; ptr, const UChar* end, SVGTransform&amp; transform)
</del><ins>+bool SVGTransformable::parseTransformValue(SVGTransform::SVGTransformType type, const UChar*&amp; ptr, const UChar* end, SVGTransform&amp; transform)
</ins><span class="cx"> {
</span><span class="cx">     if (type == SVGTransform::SVG_TRANSFORM_UNKNOWN)
</span><span class="cx">         return false;
</span><span class="lines">@@ -104,6 +104,9 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     switch (type) {
</span><ins>+    case SVGTransform::SVG_TRANSFORM_UNKNOWN:
+        ASSERT_NOT_REACHED();
+        break;
</ins><span class="cx">     case SVGTransform::SVG_TRANSFORM_SKEWX:
</span><span class="cx">         transform.setSkewX(values[0]);
</span><span class="cx">         break;
</span><span class="lines">@@ -143,7 +146,7 @@
</span><span class="cx"> static const UChar rotateDesc[] =  {'r', 'o', 't', 'a', 't', 'e'};
</span><span class="cx"> static const UChar matrixDesc[] =  {'m', 'a', 't', 'r', 'i', 'x'};
</span><span class="cx"> 
</span><del>-static inline bool parseAndSkipType(const UChar*&amp; currTransform, const UChar* end, unsigned short&amp; type)
</del><ins>+static inline bool parseAndSkipType(const UChar*&amp; currTransform, const UChar* end, SVGTransform::SVGTransformType&amp; type)
</ins><span class="cx"> {
</span><span class="cx">     if (currTransform &gt;= end)
</span><span class="cx">         return false;
</span><span class="lines">@@ -171,7 +174,7 @@
</span><span class="cx"> 
</span><span class="cx"> SVGTransform::SVGTransformType SVGTransformable::parseTransformType(const String&amp; typeString)
</span><span class="cx"> {
</span><del>-    unsigned short type = SVGTransform::SVG_TRANSFORM_UNKNOWN;
</del><ins>+    SVGTransform::SVGTransformType type = SVGTransform::SVG_TRANSFORM_UNKNOWN;
</ins><span class="cx">     auto upconvertedCharacters = StringView(typeString).upconvertedCharacters();
</span><span class="cx">     const UChar* characters = upconvertedCharacters;
</span><span class="cx">     parseAndSkipType(characters, characters + typeString.length(), type);
</span><span class="lines">@@ -186,7 +189,7 @@
</span><span class="cx">     bool delimParsed = false;
</span><span class="cx">     while (currTransform &lt; end) {
</span><span class="cx">         delimParsed = false;
</span><del>-        unsigned short type = SVGTransform::SVG_TRANSFORM_UNKNOWN;
</del><ins>+        SVGTransform::SVGTransformType type = SVGTransform::SVG_TRANSFORM_UNKNOWN;
</ins><span class="cx">         skipOptionalSVGSpaces(currTransform, end);
</span><span class="cx"> 
</span><span class="cx">         if (!parseAndSkipType(currTransform, end, type))
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoresvgSVGTransformableh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/SVGTransformable.h (195047 => 195048)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/SVGTransformable.h        2016-01-14 13:23:10 UTC (rev 195047)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/SVGTransformable.h        2016-01-14 13:29:39 UTC (rev 195048)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">     virtual ~SVGTransformable();
</span><span class="cx"> 
</span><span class="cx">     static bool parseTransformAttribute(SVGTransformList&amp;, const UChar*&amp; ptr, const UChar* end, TransformParsingMode mode = ClearList);
</span><del>-    static bool parseTransformValue(unsigned type, const UChar*&amp; ptr, const UChar* end, SVGTransform&amp;);
</del><ins>+    static bool parseTransformValue(SVGTransform::SVGTransformType, const UChar*&amp; ptr, const UChar* end, SVGTransform&amp;);
</ins><span class="cx">     static SVGTransform::SVGTransformType parseTransformType(const String&amp;);
</span><span class="cx"> 
</span><span class="cx">     virtual AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope) const override { return animatedLocalTransform(); }
</span></span></pre>
</div>
</div>

</body>
</html>