Changeset 205663 in webkit

Timestamp:

Sep 8, 2016 2:31:54 PM (8 years ago)

Author:

Chris Dumez

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLElement.cpp (modified) (1 diff)
• html/HTMLImageElement.cpp (modified) (2 diffs)
• html/HTMLInputElement.cpp (modified) (2 diffs)
• html/HTMLTextAreaElement.cpp (modified) (2 diffs)
• html/ImageInputType.cpp (modified) (2 diffs)
• html/parser/HTMLParserIdioms.cpp (modified) (3 diffs)
• html/parser/HTMLParserIdioms.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2016-09-08  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -103 +103 @@
 unsigned HTMLElement::parseBorderWidthAttribute(const AtomicString& value) const
 {
-    if (Optional<int> borderWidth = parseHTMLNonNegativeInteger(value))
+    if (Optional<unsigned> borderWidth = parseHTMLNonNegativeInteger(value))
         return borderWidth.value();
 

trunk/Source/WebCore/html/HTMLImageElement.cpp

@@ -381 +381 @@
     if (!renderer()) {
         // check the attribute first for an explicit pixel value
-        Optional<int> width = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(widthAttr));
+        Optional<unsigned> width = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(widthAttr));
         if (width)
             return width.value();
@@ -406 +406 @@
     if (!renderer()) {
         // check the attribute first for an explicit pixel value
-        Optional<int> height = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(heightAttr));
+        Optional<unsigned> height = parseHTMLNonNegativeInteger(attributeWithoutSynchronization(heightAttr));
         if (height)
             return height.value();

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -1786 +1786 @@
 {
     unsigned oldEffectiveMaxLength = effectiveMaxLength();
-    setMaxLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
+    if (Optional<unsigned> maxLength = parseHTMLNonNegativeInteger(newValue))
+        setMaxLength(maxLength.value());
+    else
+        setMaxLength(-1);
+
     if (oldEffectiveMaxLength != effectiveMaxLength())
         updateValueIfNeeded();
@@ -1798 +1802 @@
 {
     int oldMinLength = minLength();
-    setMinLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
+    if (Optional<unsigned> minLength = parseHTMLNonNegativeInteger(newValue))
+        setMinLength(minLength.value());
+    else
+        setMinLength(-1);
+
     if (oldMinLength != minLength())
         updateValueIfNeeded();

trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -206 +206 @@
 void HTMLTextAreaElement::maxLengthAttributeChanged(const AtomicString& newValue)
 {
-    setMaxLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
+    if (Optional<unsigned> maxLength = parseHTMLNonNegativeInteger(newValue))
+        setMaxLength(maxLength.value());
+    else
+        setMaxLength(-1);
+
     updateValidity();
 }
@@ -212 +216 @@
 void HTMLTextAreaElement::minLengthAttributeChanged(const AtomicString& newValue)
 {
-    setMinLength(parseHTMLNonNegativeInteger(newValue).valueOr(-1));
+    if (Optional<unsigned> minLength = parseHTMLNonNegativeInteger(newValue))
+        setMinLength(minLength.value());
+    else
+        setMinLength(-1);
+
     updateValidity();
 }

trunk/Source/WebCore/html/ImageInputType.cpp

@@ -177 +177 @@
     if (!element->renderer()) {
         // Check the attribute first for an explicit pixel value.
-        if (Optional<int> height = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(heightAttr)))
+        if (Optional<unsigned> height = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(heightAttr)))
             return height.value();
 
@@ -198 +198 @@
     if (!element->renderer()) {
         // Check the attribute first for an explicit pixel value.
-        if (Optional<int> width = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(widthAttr)))
+        if (Optional<unsigned> width = parseHTMLNonNegativeInteger(element->attributeWithoutSynchronization(widthAttr)))
             return width.value();
 

trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp

@@ -208 +208 @@
 
 // https://html.spec.whatwg.org/multipage/infrastructure.html#rules-for-parsing-non-negative-integers
-Optional<int> parseHTMLNonNegativeInteger(const String& input)
+Optional<unsigned> parseHTMLNonNegativeInteger(const String& input)
 {
     Optional<int> signedValue = parseHTMLInteger(input);
@@ -214 +214 @@
         return Nullopt;
 
-    return signedValue;
+    return static_cast<unsigned>(signedValue.value());
 }
 
@@ -364 +364 @@
         ++position;
 
-    Optional<int> number = parseHTMLNonNegativeInteger(StringView(numberStart, position - numberStart).toStringWithoutCopying());
+    Optional<unsigned> number = parseHTMLNonNegativeInteger(StringView(numberStart, position - numberStart).toStringWithoutCopying());
     if (!number)
         return false;

trunk/Source/WebCore/html/parser/HTMLParserIdioms.h

@@ -66 +66 @@
 
 // http://www.whatwg.org/specs/web-apps/current-work/#rules-for-parsing-non-negative-integers
-WEBCORE_EXPORT Optional<int> parseHTMLNonNegativeInteger(const String&);
+WEBCORE_EXPORT Optional<unsigned> parseHTMLNonNegativeInteger(const String&);
 
 // https://html.spec.whatwg.org/#valid-non-negative-integer