[giow] (3) Finish fixing bug 10352.

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=17705 Affected topics: HTML git-svn-id: http://svn.whatwg.org/webapps@7288 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 27, 2012 · 4df6889 · 4df6889
1 parent 4ef7031
commit 4df6889
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 33 deletions.
diff --git a/complete.html b/complete.html
@@ -8977,12 +8977,15 @@ <h4 id=reflecting-content-attributes-in-idl-attributes><span class=secno>2.8.1 <
   must be returned. If, on the other hand, it fails or returns an out
   of range value, or if the attribute is absent, the default value
   must be returned instead, or 0 if there is no default value. On
-  setting, the given value must be converted to the shortest possible
-  string representing the number as a <a href=#valid-non-negative-integer>valid non-negative
-  integer</a> and then that string must be used as the new content
-  attribute value.</p>
-  <!-- see http://www.w3.org/Bugs/Public/show_bug.cgi?id=10352 and
-  https://bugzilla.mozilla.org/show_bug.cgi?id=586118 for why the
+  setting, first, if the new value is in the range 0 to 2147483647,
+  then let <var title="">n</var> be the new value, otherwise let <var title="">n</var> be the default value, or 0 if there is no default
+  value; then, <var title="">n</var> must be converted to the shortest
+  possible string representing the number as a <a href=#valid-non-negative-integer>valid
+  non-negative integer</a> and that string must be used as the new
+  content attribute value.</p>
+  <!-- see http://www.w3.org/Bugs/Public/show_bug.cgi?id=10352
+  https://bugzilla.mozilla.org/show_bug.cgi?id=586118 and
+  https://www.w3.org/Bugs/Public/show_bug.cgi?id=17705 for why the
   range is clamped to 2147483647 rather the normal unsigned long
   maximum value of 4294967295 -->
 
@@ -8997,11 +9000,14 @@ <h4 id=reflecting-content-attributes-in-idl-attributes><span class=secno>2.8.1 <
   fails or returns an out of range value, or if the attribute is
   absent, the default value must be returned instead, or 1 if there is
   no default value. On setting, if the value is zero, the user agent
-  must throw an <code><a href=#indexsizeerror>IndexSizeError</a></code> exception. Otherwise, the
-  given value must be converted to the shortest possible string
-  representing the number as a <a href=#valid-non-negative-integer>valid non-negative integer</a>
-  and then that string must be used as the new content attribute
-  value.</p> <!-- see previous paragraph for note about the range -->
+  must throw an <code><a href=#indexsizeerror>IndexSizeError</a></code> exception. Otherwise,
+  first, if the new value is in the range 1 to 2147483647, then let
+  <var title="">n</var> be the new value, otherwise let <var title="">n</var> be the default value, or 1 if there is no default
+  value; then, <var title="">n</var> must be converted to the shortest
+  possible string representing the number as a <a href=#valid-non-negative-integer>valid
+  non-negative integer</a> and that string must be used as the new
+  content attribute value.</p>
+  <!-- see previous paragraph for note about the weird range -->
 
   <p>If a reflecting IDL attribute has a floating-point number type
   (<code>double</code> or <code>unrestricted double</code>), then, on

diff --git a/index b/index
@@ -8977,12 +8977,15 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
   must be returned. If, on the other hand, it fails or returns an out
   of range value, or if the attribute is absent, the default value
   must be returned instead, or 0 if there is no default value. On
-  setting, the given value must be converted to the shortest possible
-  string representing the number as a <a href=#valid-non-negative-integer>valid non-negative
-  integer</a> and then that string must be used as the new content
-  attribute value.</p>
-  <!-- see http://www.w3.org/Bugs/Public/show_bug.cgi?id=10352 and
-  https://bugzilla.mozilla.org/show_bug.cgi?id=586118 for why the
+  setting, first, if the new value is in the range 0 to 2147483647,
+  then let <var title="">n</var> be the new value, otherwise let <var title="">n</var> be the default value, or 0 if there is no default
+  value; then, <var title="">n</var> must be converted to the shortest
+  possible string representing the number as a <a href=#valid-non-negative-integer>valid
+  non-negative integer</a> and that string must be used as the new
+  content attribute value.</p>
+  <!-- see http://www.w3.org/Bugs/Public/show_bug.cgi?id=10352
+  https://bugzilla.mozilla.org/show_bug.cgi?id=586118 and
+  https://www.w3.org/Bugs/Public/show_bug.cgi?id=17705 for why the
   range is clamped to 2147483647 rather the normal unsigned long
   maximum value of 4294967295 -->
 
@@ -8997,11 +9000,14 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
   fails or returns an out of range value, or if the attribute is
   absent, the default value must be returned instead, or 1 if there is
   no default value. On setting, if the value is zero, the user agent
-  must throw an <code><a href=#indexsizeerror>IndexSizeError</a></code> exception. Otherwise, the
-  given value must be converted to the shortest possible string
-  representing the number as a <a href=#valid-non-negative-integer>valid non-negative integer</a>
-  and then that string must be used as the new content attribute
-  value.</p> <!-- see previous paragraph for note about the range -->
+  must throw an <code><a href=#indexsizeerror>IndexSizeError</a></code> exception. Otherwise,
+  first, if the new value is in the range 1 to 2147483647, then let
+  <var title="">n</var> be the new value, otherwise let <var title="">n</var> be the default value, or 1 if there is no default
+  value; then, <var title="">n</var> must be converted to the shortest
+  possible string representing the number as a <a href=#valid-non-negative-integer>valid
+  non-negative integer</a> and that string must be used as the new
+  content attribute value.</p>
+  <!-- see previous paragraph for note about the weird range -->
 
   <p>If a reflecting IDL attribute has a floating-point number type
   (<code>double</code> or <code>unrestricted double</code>), then, on

diff --git a/source b/source
@@ -8977,12 +8977,16 @@ is conforming depends on which specs apply, and leaves it at that. -->
   must be returned. If, on the other hand, it fails or returns an out
   of range value, or if the attribute is absent, the default value
   must be returned instead, or 0 if there is no default value. On
-  setting, the given value must be converted to the shortest possible
-  string representing the number as a <span>valid non-negative
-  integer</span> and then that string must be used as the new content
-  attribute value.</p>
-  <!-- see http://www.w3.org/Bugs/Public/show_bug.cgi?id=10352 and
-  https://bugzilla.mozilla.org/show_bug.cgi?id=586118 for why the
+  setting, first, if the new value is in the range 0 to 2147483647,
+  then let <var title="">n</var> be the new value, otherwise let <var
+  title="">n</var> be the default value, or 0 if there is no default
+  value; then, <var title="">n</var> must be converted to the shortest
+  possible string representing the number as a <span>valid
+  non-negative integer</span> and that string must be used as the new
+  content attribute value.</p>
+  <!-- see http://www.w3.org/Bugs/Public/show_bug.cgi?id=10352
+  https://bugzilla.mozilla.org/show_bug.cgi?id=586118 and
+  https://www.w3.org/Bugs/Public/show_bug.cgi?id=17705 for why the
   range is clamped to 2147483647 rather the normal unsigned long
   maximum value of 4294967295 -->
 
@@ -8997,11 +9001,15 @@ is conforming depends on which specs apply, and leaves it at that. -->
   fails or returns an out of range value, or if the attribute is
   absent, the default value must be returned instead, or 1 if there is
   no default value. On setting, if the value is zero, the user agent
-  must throw an <code>IndexSizeError</code> exception. Otherwise, the
-  given value must be converted to the shortest possible string
-  representing the number as a <span>valid non-negative integer</span>
-  and then that string must be used as the new content attribute
-  value.</p> <!-- see previous paragraph for note about the range -->
+  must throw an <code>IndexSizeError</code> exception. Otherwise,
+  first, if the new value is in the range 1 to 2147483647, then let
+  <var title="">n</var> be the new value, otherwise let <var
+  title="">n</var> be the default value, or 1 if there is no default
+  value; then, <var title="">n</var> must be converted to the shortest
+  possible string representing the number as a <span>valid
+  non-negative integer</span> and that string must be used as the new
+  content attribute value.</p>
+  <!-- see previous paragraph for note about the weird range -->
 
   <p>If a reflecting IDL attribute has a floating-point number type
   (<code>double</code> or <code>unrestricted double</code>), then, on