<!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>[205663] 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/205663">205663</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-08 14:31:54 -0700 (Thu, 08 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update parseHTMLNonNegativeInteger() to return an unsigned value
https://bugs.webkit.org/show_bug.cgi?id=161759
Reviewed by Alex Christensen.
Update parseHTMLNonNegativeInteger() to return an unsigned value instead
of a signed one as the value can never be negative.
* html/HTMLElement.cpp:
(WebCore::HTMLElement::parseBorderWidthAttribute):
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::width):
(WebCore::HTMLImageElement::height):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::maxLengthAttributeChanged):
(WebCore::HTMLInputElement::minLengthAttributeChanged):
* html/HTMLTextAreaElement.cpp:
(WebCore::HTMLTextAreaElement::maxLengthAttributeChanged):
(WebCore::HTMLTextAreaElement::minLengthAttributeChanged):
* html/ImageInputType.cpp:
(WebCore::ImageInputType::height):
(WebCore::ImageInputType::width):
* html/parser/HTMLParserIdioms.cpp:
(WebCore::parseHTMLNonNegativeInteger):
(WebCore::parseHTTPRefreshInternal):
* html/parser/HTMLParserIdioms.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementcpp">trunk/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextAreaElementcpp">trunk/Source/WebCore/html/HTMLTextAreaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlImageInputTypecpp">trunk/Source/WebCore/html/ImageInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserIdiomscpp">trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserIdiomsh">trunk/Source/WebCore/html/parser/HTMLParserIdioms.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205662 => 205663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-08 21:30:17 UTC (rev 205662)
+++ trunk/Source/WebCore/ChangeLog 2016-09-08 21:31:54 UTC (rev 205663)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-09-08 Chris Dumez <cdumez@apple.com>
+
+ Update parseHTMLNonNegativeInteger() to return an unsigned value
+ https://bugs.webkit.org/show_bug.cgi?id=161759
+
+ Reviewed by Alex Christensen.
+
+ Update parseHTMLNonNegativeInteger() to return an unsigned value instead
+ of a signed one as the value can never be negative.
+
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::parseBorderWidthAttribute):
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::width):
+ (WebCore::HTMLImageElement::height):
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::maxLengthAttributeChanged):
+ (WebCore::HTMLInputElement::minLengthAttributeChanged):
+ * html/HTMLTextAreaElement.cpp:
+ (WebCore::HTMLTextAreaElement::maxLengthAttributeChanged):
+ (WebCore::HTMLTextAreaElement::minLengthAttributeChanged):
+ * html/ImageInputType.cpp:
+ (WebCore::ImageInputType::height):
+ (WebCore::ImageInputType::width):
+ * html/parser/HTMLParserIdioms.cpp:
+ (WebCore::parseHTMLNonNegativeInteger):
+ (WebCore::parseHTTPRefreshInternal):
+ * html/parser/HTMLParserIdioms.h:
+
</ins><span class="cx"> 2016-09-08 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of the color profile from ImageFrame and ImageDecoder
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (205662 => 205663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp 2016-09-08 21:30:17 UTC (rev 205662)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2016-09-08 21:31:54 UTC (rev 205663)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned HTMLElement::parseBorderWidthAttribute(const AtomicString& value) const
</span><span class="cx"> {
</span><del>- if (Optional<int> borderWidth = parseHTMLNonNegativeInteger(value))
</del><ins>+ if (Optional<unsigned> borderWidth = parseHTMLNonNegativeInteger(value))
</ins><span class="cx"> return borderWidth.value();
</span><span class="cx">
</span><span class="cx"> return hasTagName(tableTag) ? 1 : 0;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (205662 => 205663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2016-09-08 21:30:17 UTC (rev 205662)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2016-09-08 21:31:54 UTC (rev 205663)
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!renderer()) {
</span><span class="cx"> // check the attribute first for an explicit pixel value
</span><del>- Optional<int> width = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(widthAttr));
</del><ins>+ Optional<unsigned> width = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(widthAttr));
</ins><span class="cx"> if (width)
</span><span class="cx"> return width.value();
</span><span class="cx">
</span><span class="lines">@@ -405,7 +405,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!renderer()) {
</span><span class="cx"> // check the attribute first for an explicit pixel value
</span><del>- Optional<int> height = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(heightAttr));
</del><ins>+ Optional<unsigned> height = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(heightAttr));
</ins><span class="cx"> if (height)
</span><span class="cx"> return height.value();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (205662 => 205663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-09-08 21:30:17 UTC (rev 205662)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-09-08 21:31:54 UTC (rev 205663)
</span><span class="lines">@@ -1785,7 +1785,11 @@
</span><span class="cx"> void HTMLInputElement::maxLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><span class="cx"> unsigned oldEffectiveMaxLength = effectiveMaxLength();
</span><del>- setMaxLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</del><ins>+ if (Optional<unsigned> maxLength = parseHTMLNonNegativeInteger(newValue))
+ setMaxLength(maxLength.value());
+ else
+ setMaxLength(-1);
+
</ins><span class="cx"> if (oldEffectiveMaxLength != effectiveMaxLength())
</span><span class="cx"> updateValueIfNeeded();
</span><span class="cx">
</span><span class="lines">@@ -1797,7 +1801,11 @@
</span><span class="cx"> void HTMLInputElement::minLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><span class="cx"> int oldMinLength = minLength();
</span><del>- setMinLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</del><ins>+ if (Optional<unsigned> minLength = parseHTMLNonNegativeInteger(newValue))
+ setMinLength(minLength.value());
+ else
+ setMinLength(-1);
+
</ins><span class="cx"> if (oldMinLength != minLength())
</span><span class="cx"> updateValueIfNeeded();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextAreaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (205662 => 205663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2016-09-08 21:30:17 UTC (rev 205662)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2016-09-08 21:31:54 UTC (rev 205663)
</span><span class="lines">@@ -205,13 +205,21 @@
</span><span class="cx">
</span><span class="cx"> void HTMLTextAreaElement::maxLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><del>- setMaxLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</del><ins>+ if (Optional<unsigned> maxLength = parseHTMLNonNegativeInteger(newValue))
+ setMaxLength(maxLength.value());
+ else
+ setMaxLength(-1);
+
</ins><span class="cx"> updateValidity();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTextAreaElement::minLengthAttributeChanged(const AtomicString& newValue)
</span><span class="cx"> {
</span><del>- setMinLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
</del><ins>+ if (Optional<unsigned> minLength = parseHTMLNonNegativeInteger(newValue))
+ setMinLength(minLength.value());
+ else
+ setMinLength(-1);
+
</ins><span class="cx"> updateValidity();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageInputType.cpp (205662 => 205663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageInputType.cpp 2016-09-08 21:30:17 UTC (rev 205662)
+++ trunk/Source/WebCore/html/ImageInputType.cpp 2016-09-08 21:31:54 UTC (rev 205663)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx">
</span><span class="cx"> if (!element->renderer()) {
</span><span class="cx"> // Check the attribute first for an explicit pixel value.
</span><del>- if (Optional<int> height = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(heightAttr)))
</del><ins>+ if (Optional<unsigned> height = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(heightAttr)))
</ins><span class="cx"> return height.value();
</span><span class="cx">
</span><span class="cx"> // If the image is available, use its height.
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> if (!element->renderer()) {
</span><span class="cx"> // Check the attribute first for an explicit pixel value.
</span><del>- if (Optional<int> width = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(widthAttr)))
</del><ins>+ if (Optional<unsigned> width = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(widthAttr)))
</ins><span class="cx"> return width.value();
</span><span class="cx">
</span><span class="cx"> // If the image is available, use its width.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserIdiomscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp (205662 => 205663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2016-09-08 21:30:17 UTC (rev 205662)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2016-09-08 21:31:54 UTC (rev 205663)
</span><span class="lines">@@ -207,13 +207,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // https://html.spec.whatwg.org/multipage/infrastructure.html#rules-for-parsing-non-negative-integers
</span><del>-Optional<int> parseHTMLNonNegativeInteger(const String& input)
</del><ins>+Optional<unsigned> parseHTMLNonNegativeInteger(const String& input)
</ins><span class="cx"> {
</span><span class="cx"> Optional<int> signedValue = parseHTMLInteger(input);
</span><span class="cx"> if (!signedValue || signedValue.value() < 0)
</span><span class="cx"> return Nullopt;
</span><span class="cx">
</span><del>- return signedValue;
</del><ins>+ return static_cast<unsigned>(signedValue.value());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> while (position < end && isASCIIDigit(*position))
</span><span class="cx"> ++position;
</span><span class="cx">
</span><del>- Optional<int> number = parseHTMLNonNegativeInteger(StringView(numberStart, position - numberStart).toStringWithoutCopying());
</del><ins>+ Optional<unsigned> number = parseHTMLNonNegativeInteger(StringView(numberStart, position - numberStart).toStringWithoutCopying());
</ins><span class="cx"> if (!number)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserIdiomsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.h (205662 => 205663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.h 2016-09-08 21:30:17 UTC (rev 205662)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.h 2016-09-08 21:31:54 UTC (rev 205663)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> WEBCORE_EXPORT Optional<int> parseHTMLInteger(const String&);
</span><span class="cx">
</span><span class="cx"> // http://www.whatwg.org/specs/web-apps/current-work/#rules-for-parsing-non-negative-integers
</span><del>-WEBCORE_EXPORT Optional<int> parseHTMLNonNegativeInteger(const String&);
</del><ins>+WEBCORE_EXPORT Optional<unsigned> parseHTMLNonNegativeInteger(const String&);
</ins><span class="cx">
</span><span class="cx"> // https://html.spec.whatwg.org/#valid-non-negative-integer
</span><span class="cx"> Optional<int> parseValidHTMLNonNegativeInteger(StringView);
</span></span></pre>
</div>
</div>
</body>
</html>