Changeset 278689 in webkit

Timestamp:

Jun 9, 2021, 8:17:05 PM (5 years ago)

Author:

cathiechen

Message:

Aspect ratio from width and height attribute is not compatible to string with invalid ends
​https://bugs.webkit.org/show_bug.cgi?id=226469

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

• web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt:

Source/WebCore:

The patch follows the steps defined in [1] to parse the dimension values from the attribute values.
It adds HTMLDimension to present the dimension value which has two types, Percentage and Pixel.
And parseHTMLDimension() follows the specification steps to check validation and parse the dimension
value. Currently, it is only used by parsing aspect-ratio from width and height attributes. It will
apply to other attributes length parse in the future patch.

[1] ​https://html.spec.whatwg.org/#rules-for-parsing-dimension-values

• html/HTMLElement.cpp:

(WebCore::HTMLElement::applyAspectRatioFromWidthAndHeightAttributesToStyle): Call parseHTMLDimension to get the length values.

• html/parser/HTMLParserIdioms.cpp:

(WebCore::parseHTMLDimensionNumber):
(WebCore::parseHTMLDimension):

• html/parser/HTMLParserIdioms.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLElement.cpp (modified) (1 diff)
• Source/WebCore/html/parser/HTMLParserIdioms.cpp (modified) (2 diffs)
• Source/WebCore/html/parser/HTMLParserIdioms.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-06-09  Cathie Chen  <cathiechen@igalia.com>
+
+        Aspect ratio from width and height attribute is not compatible to string with invalid ends
+        https://bugs.webkit.org/show_bug.cgi?id=226469
+
+        Reviewed by Antti Koivisto.
+
+        * web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt:
+
 2021-06-09  Alex Christensen  <achristensen@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt

@@ -5 +5 @@
 PASS Create, append and test immediately: <img> with attributes width=0.8, height=0.2
 PASS Create, append and test immediately: <img> with attributes width=50% height=25%
-FAIL Create, append and test immediately: <img> with invalid trailing attributes width=50pp height=25xx assert_approx_equals: expected 2 +/- 0.001 but got Infinity
+PASS Create, append and test immediately: <img> with invalid trailing attributes width=50pp height=25xx
 PASS Computed style test: img with {"width":"10","height":"20"}
 PASS Computed style test: input with {"type":"image","width":"10","height":"20"}

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-09  Cathie Chen  <cathiechen@igalia.com>
+
+        Aspect ratio from width and height attribute is not compatible to string with invalid ends
+        https://bugs.webkit.org/show_bug.cgi?id=226469
+
+        Reviewed by Antti Koivisto.
+
+        The patch follows the steps defined in [1] to parse the dimension values from the attribute values.
+        It adds HTMLDimension to present the dimension value which has two types, Percentage and Pixel.
+        And parseHTMLDimension() follows the specification steps to check validation and parse the dimension
+        value. Currently, it is only used by parsing aspect-ratio from width and height attributes. It will
+        apply to other attributes length parse in the future patch.
+
+        [1] https://html.spec.whatwg.org/#rules-for-parsing-dimension-values
+
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::applyAspectRatioFromWidthAndHeightAttributesToStyle): Call parseHTMLDimension to get the length values.
+        * html/parser/HTMLParserIdioms.cpp:
+        (WebCore::parseHTMLDimensionNumber):
+        (WebCore::parseHTMLDimension):
+        * html/parser/HTMLParserIdioms.h:
+
 2021-06-09  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -631 +631 @@
         return;
 
-    double width = parseValidHTMLFloatingPointNumber(attributeWithoutSynchronization(widthAttr)).value_or(-1);
-    if (width < 0)
+    auto dimensionWidth = parseHTMLDimension(attributeWithoutSynchronization(widthAttr));
+    if (!dimensionWidth || dimensionWidth->type != HTMLDimension::Type::Pixel)
         return;
-    double height = parseValidHTMLFloatingPointNumber(attributeWithoutSynchronization(heightAttr)).value_or(-1);
-    if (height < 0)
+    auto dimensionHeight = parseHTMLDimension(attributeWithoutSynchronization(heightAttr));
+    if (!dimensionHeight || dimensionHeight->type != HTMLDimension::Type::Pixel)
         return;
 
     auto ratioList = CSSValueList::createSlashSeparated();
-    ratioList->append(CSSValuePool::singleton().createValue(width, CSSUnitType::CSS_NUMBER));
-    ratioList->append(CSSValuePool::singleton().createValue(height, CSSUnitType::CSS_NUMBER));
+    ratioList->append(CSSValuePool::singleton().createValue(dimensionWidth->number, CSSUnitType::CSS_NUMBER));
+    ratioList->append(CSSValuePool::singleton().createValue(dimensionHeight->number, CSSUnitType::CSS_NUMBER));
     auto list = CSSValueList::createSpaceSeparated();
     list->append(CSSValuePool::singleton().createIdentifierValue(CSSValueAuto));

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

@@ -27 +27 @@
 
 #include "Decimal.h"
+#include "ParsingUtilities.h"
 #include "QualifiedName.h"
 #include <limits>
@@ -476 +477 @@
 }
 
-}
+struct HTMLDimensionParsingResult {
+    double number;
+    unsigned parsedLength;
+};
+
+template <typename CharacterType>
+static std::optional<HTMLDimensionParsingResult> parseHTMLDimensionNumber(const CharacterType* position, unsigned length)
+{
+    if (!length || !position)
+        return std::nullopt;
+
+    const auto* begin = position;
+    const auto* end = position + length;
+    skipWhile<isHTMLSpace>(position, end);
+    if (position == end)
+        return std::nullopt;
+
+    auto* start = position;
+    skipWhile<isASCIIDigit>(position, end);
+    if (start == position)
+        return std::nullopt;
+
+    if (skipExactly(position, end, '.'))
+        skipWhile<isASCIIDigit>(position, end);
+
+    size_t parsedLength = 0;
+    double number = parseDouble(start, position - start, parsedLength);
+    if (!(parsedLength && std::isfinite(number)))
+        return std::nullopt;
+
+    HTMLDimensionParsingResult result;
+    result.number = number;
+    result.parsedLength = position - begin;
+    return result;
+}
+
+std::optional<HTMLDimension> parseHTMLDimension(StringView dimensionString)
+{
+    std::optional<HTMLDimensionParsingResult> result;
+    auto length = dimensionString.length();
+    if (dimensionString.is8Bit())
+        result = parseHTMLDimensionNumber(dimensionString.characters8(), length);
+    else
+        result = parseHTMLDimensionNumber(dimensionString.characters16(), length);
+    if (!result)
+        return std::nullopt;
+
+    HTMLDimension dimension;
+    dimension.number = result->number;
+    dimension.type = HTMLDimension::Type::Pixel;
+    if (result->parsedLength < dimensionString.length() && dimensionString[result->parsedLength] == '%')
+        dimension.type = HTMLDimension::Type::Percentage;
+    return dimension;
+}
+
+}

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

@@ -87 +87 @@
 AtomString parseHTMLHashNameReference(StringView);
 
+// https://html.spec.whatwg.org/#rules-for-parsing-dimension-values
+struct HTMLDimension {
+    enum class Type : bool { Percentage, Pixel };
+    double number;
+    Type type;
+};
+std::optional<HTMLDimension> parseHTMLDimension(StringView);
+
 // Inline implementations of some of the functions declared above.