<!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>[195315] 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/195315">195315</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-19 14:01:55 -0800 (Tue, 19 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>SVG 2 requires a mechanism for restricting enum values exposed through the DOM
https://bugs.webkit.org/show_bug.cgi?id=152814
Patch by Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au> on 2016-01-19
Reviewed by Darin Adler.
No new tests (No change in functionality, blocked bugs add new tests).
This patch adds a mechanism to restrict the values returned through the
SVGAnimatedEnumeration interface.
This is required for SVG 2, which does not expose new enumeration
values through the IDL.
See http://www.w3.org/TR/SVG2/types.html#InterfaceSVGAnimatedEnumeration
Getters:
SVG 2 does not add numeric type values for new options, new options
should return UNKNOWN.
E.g. See the table defining numeric type values for orient at
http://www.w3.org/TR/SVG2/painting.html#InterfaceSVGMarkerElement
Setters:
On setting baseVal, the following steps are run:
1. ...
2. If value is 0 or is not the numeric type value for any value of the reflected attribute, then set the reflected attribute to the empty string.
* svg/properties/SVGAnimatedEnumerationPropertyTearOff.h:
Override baseVal() and animVal() to perform range checks against
the highest exposed enum value.
* svg/properties/SVGAnimatedStaticPropertyTearOff.h:
(WebCore::SVGAnimatedStaticPropertyTearOff::baseVal): Mark function as virtual as it's over-ridden for enumerations.
(WebCore::SVGAnimatedStaticPropertyTearOff::animVal): Mark function as virtual as it's over-ridden for enumerations.
* svg/properties/SVGPropertyTraits.h:
Add SVGIDLEnumLimits struct that contains function for querying the
highest exposed enum value.
(WebCore::SVGIDLEnumLimits::highestExposedEnumValue): New function that returns the highest enum value that should
be exposed through the DOM. This function should be specialized for enum types that need to restrict the exposed
values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvgpropertiesSVGAnimatedEnumerationPropertyTearOffh">trunk/Source/WebCore/svg/properties/SVGAnimatedEnumerationPropertyTearOff.h</a></li>
<li><a href="#trunkSourceWebCoresvgpropertiesSVGAnimatedStaticPropertyTearOffh">trunk/Source/WebCore/svg/properties/SVGAnimatedStaticPropertyTearOff.h</a></li>
<li><a href="#trunkSourceWebCoresvgpropertiesSVGPropertyTraitsh">trunk/Source/WebCore/svg/properties/SVGPropertyTraits.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195314 => 195315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-19 21:49:12 UTC (rev 195314)
+++ trunk/Source/WebCore/ChangeLog 2016-01-19 22:01:55 UTC (rev 195315)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-01-19 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
+
+ SVG 2 requires a mechanism for restricting enum values exposed through the DOM
+ https://bugs.webkit.org/show_bug.cgi?id=152814
+
+ Reviewed by Darin Adler.
+
+ No new tests (No change in functionality, blocked bugs add new tests).
+
+ This patch adds a mechanism to restrict the values returned through the
+ SVGAnimatedEnumeration interface.
+ This is required for SVG 2, which does not expose new enumeration
+ values through the IDL.
+ See http://www.w3.org/TR/SVG2/types.html#InterfaceSVGAnimatedEnumeration
+ Getters:
+ SVG 2 does not add numeric type values for new options, new options
+ should return UNKNOWN.
+ E.g. See the table defining numeric type values for orient at
+ http://www.w3.org/TR/SVG2/painting.html#InterfaceSVGMarkerElement
+ Setters:
+ On setting baseVal, the following steps are run:
+ 1. ...
+ 2. If value is 0 or is not the numeric type value for any value of the reflected attribute, then set the reflected attribute to the empty string.
+
+ * svg/properties/SVGAnimatedEnumerationPropertyTearOff.h:
+ Override baseVal() and animVal() to perform range checks against
+ the highest exposed enum value.
+ * svg/properties/SVGAnimatedStaticPropertyTearOff.h:
+ (WebCore::SVGAnimatedStaticPropertyTearOff::baseVal): Mark function as virtual as it's over-ridden for enumerations.
+ (WebCore::SVGAnimatedStaticPropertyTearOff::animVal): Mark function as virtual as it's over-ridden for enumerations.
+ * svg/properties/SVGPropertyTraits.h:
+ Add SVGIDLEnumLimits struct that contains function for querying the
+ highest exposed enum value.
+ (WebCore::SVGIDLEnumLimits::highestExposedEnumValue): New function that returns the highest enum value that should
+ be exposed through the DOM. This function should be specialized for enum types that need to restrict the exposed
+ values.
+
</ins><span class="cx"> 2016-01-19 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Fixed compilation of AXObjectCache in case of !HAVE(ACCESSIBILITY).
</span></span></pre></div>
<a id="trunkSourceWebCoresvgpropertiesSVGAnimatedEnumerationPropertyTearOffh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/properties/SVGAnimatedEnumerationPropertyTearOff.h (195314 => 195315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/properties/SVGAnimatedEnumerationPropertyTearOff.h 2016-01-19 21:49:12 UTC (rev 195314)
+++ trunk/Source/WebCore/svg/properties/SVGAnimatedEnumerationPropertyTearOff.h 2016-01-19 22:01:55 UTC (rev 195315)
</span><span class="lines">@@ -27,12 +27,32 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> template<typename EnumType>
</span><del>-class SVGAnimatedEnumerationPropertyTearOff : public SVGAnimatedStaticPropertyTearOff<unsigned> {
</del><ins>+class SVGAnimatedEnumerationPropertyTearOff final : public SVGAnimatedStaticPropertyTearOff<unsigned> {
</ins><span class="cx"> public:
</span><ins>+ virtual unsigned& baseVal() override
+ {
+ unsigned& baseVal = SVGAnimatedStaticPropertyTearOff::baseVal();
+
+ if (baseVal > SVGIDLEnumLimits<EnumType>::highestExposedEnumValue())
+ return m_outOfRangeEnumValue;
+
+ return baseVal;
+ }
+
+ virtual unsigned& animVal() override
+ {
+ unsigned& animVal = SVGAnimatedStaticPropertyTearOff::animVal();
+
+ if (animVal > SVGIDLEnumLimits<EnumType>::highestExposedEnumValue())
+ return m_outOfRangeEnumValue;
+
+ return animVal;
+ }
+
</ins><span class="cx"> virtual void setBaseVal(const unsigned& property, ExceptionCode& ec) override
</span><span class="cx"> {
</span><span class="cx"> // All SVG enumeration values, that are allowed to be set via SVG DOM start with 1, 0 corresponds to unknown and is not settable through SVG DOM.
</span><del>- if (!property || property > SVGPropertyTraits<EnumType>::highestEnumValue()) {
</del><ins>+ if (!property || property > SVGIDLEnumLimits<EnumType>::highestExposedEnumValue()) {
</ins><span class="cx"> ec = SVGException::SVG_INVALID_VALUE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -57,8 +77,14 @@
</span><span class="cx"> : SVGAnimatedStaticPropertyTearOff<unsigned>(contextElement, attributeName, animatedPropertyType, property)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
+ static unsigned m_outOfRangeEnumValue;
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+// By convention, all enum values that represent UNKNOWN in SVG are equal to zero.
+template<typename EnumType>
+unsigned SVGAnimatedEnumerationPropertyTearOff<EnumType>::m_outOfRangeEnumValue = 0;
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // SVGAnimatedEnumerationPropertyTearOff_h
</span></span></pre></div>
<a id="trunkSourceWebCoresvgpropertiesSVGAnimatedStaticPropertyTearOffh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/properties/SVGAnimatedStaticPropertyTearOff.h (195314 => 195315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/properties/SVGAnimatedStaticPropertyTearOff.h 2016-01-19 21:49:12 UTC (rev 195314)
+++ trunk/Source/WebCore/svg/properties/SVGAnimatedStaticPropertyTearOff.h 2016-01-19 22:01:55 UTC (rev 195315)
</span><span class="lines">@@ -30,12 +30,12 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef PropertyType ContentType;
</span><span class="cx">
</span><del>- PropertyType& baseVal()
</del><ins>+ virtual PropertyType& baseVal()
</ins><span class="cx"> {
</span><span class="cx"> return m_property;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- PropertyType& animVal()
</del><ins>+ virtual PropertyType& animVal()
</ins><span class="cx"> {
</span><span class="cx"> if (m_animatedProperty)
</span><span class="cx"> return *m_animatedProperty;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgpropertiesSVGPropertyTraitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/properties/SVGPropertyTraits.h (195314 => 195315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/properties/SVGPropertyTraits.h 2016-01-19 21:49:12 UTC (rev 195314)
+++ trunk/Source/WebCore/svg/properties/SVGPropertyTraits.h 2016-01-19 22:01:55 UTC (rev 195315)
</span><span class="lines">@@ -58,6 +58,12 @@
</span><span class="cx"> static String toString(const String& type) { return type; }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename EnumType>
+struct SVGIDLEnumLimits {
+ // Specialize this function for a particular enumeration to limit the values that are exposed through the DOM.
+ static unsigned highestExposedEnumValue() { return SVGPropertyTraits<EnumType>::highestEnumValue(); }
+};
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>