Attachment 357962 Details for Bug 192922 – Patch

[patch] Patch

bug-192922-20181221115557.patch (text/plain), 3.43 KB, created by Justin Michaud on 2018-12-21 11:56:05 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Michaud

Created: 2018-12-21 11:56:05 PST

Size: 3.43 KB

patch

obsolete

>Subversion Revision: 239507
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d79908336129502d1f309ed4092b0225cc4f93d3..4c6f074fa48312ca55ee2437db7320d6d14fe178 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-12-21  Justin Michaud  <justin_michaud@apple.com>
>+
>+        CSS variables don't work for colors in "border" property
>+        https://bugs.webkit.org/show_bug.cgi?id=192922
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        ParseColorFunction no longer consumes anything if the color was not valid.
>+
>+        Test: css-custom-properties-api/border-variable-parsing.html
>+
>+        * css/parser/CSSPropertyParserHelpers.cpp:
>+        (WebCore::CSSPropertyParserHelpers::parseColorFunction):
>+
> 2018-12-21  Justin Michaud  <justin_michaud@apple.com>
> 
>         Repeated background images with zero size should display the background color
>diff --git a/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp b/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
>index ae94864ce13b93d286814730b4d81b0f23193fe7..03b11ae33ac5512efa12ecf6a31efec49f7cb3d0 100644
>--- a/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
>+++ b/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
>@@ -681,7 +681,8 @@ static Color parseColorFunction(CSSParserTokenRange& range, CSSParserMode cssPar
>     default:
>         return Color();
>     }
>-    range = colorRange;
>+    if (color.isValid())
>+        range = colorRange;
>     return color;
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index ff8a86d45ad796e27514a9701d971d64bd30badb..8768fb2bf3ffa7e7685e64f54899fad88af477ad 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-12-21  Justin Michaud  <justin_michaud@apple.com>
>+
>+        CSS variables don't work for colors in "border" property
>+        https://bugs.webkit.org/show_bug.cgi?id=192922
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * css-custom-properties-api/border-variable-parsing-expected.html: Added.
>+        * css-custom-properties-api/border-variable-parsing.html: Added.
>+
> 2018-12-21  Alex Christensen  <achristensen@webkit.org>
> 
>         Revert r239503.
>diff --git a/LayoutTests/css-custom-properties-api/border-variable-parsing-expected.html b/LayoutTests/css-custom-properties-api/border-variable-parsing-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..4dd0b2db45a623b16710d8db1dabe28e288e3f18
>--- /dev/null
>+++ b/LayoutTests/css-custom-properties-api/border-variable-parsing-expected.html
>@@ -0,0 +1,16 @@
>+<style>
>+#el1 {
>+    --foreground: 100;
>+    border: 30px dashed rgb(100, 0, 100);
>+}
>+#el2 {
>+    --foreground: 100;
>+    border: 30px rgb(100, 0, 100) dashed;
>+}
>+div {
>+    width: 150px;
>+    height: 150px;
>+}
>+</style>
>+<div id="el1"></div>
>+<div id="el2"></div>
>diff --git a/LayoutTests/css-custom-properties-api/border-variable-parsing.html b/LayoutTests/css-custom-properties-api/border-variable-parsing.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..4351b6c8c91c01b9543613a9a634cbdd34b98d4f
>--- /dev/null
>+++ b/LayoutTests/css-custom-properties-api/border-variable-parsing.html
>@@ -0,0 +1,16 @@
>+<style>
>+#el1 {
>+    --foreground: 100;
>+    border: 30px dashed rgb(100, 0, var(--foreground));
>+}
>+#el2 {
>+    --foreground: 100;
>+    border: 30px rgb(100, 0, var(--foreground)) dashed;
>+}
>+div {
>+    width: 150px;
>+    height: 150px;
>+}
>+</style>
>+<div id="el1"></div>
>+<div id="el2"></div>

Actions: View | Formatted Diff | Diff

Attachments on bug 192922: 357798 | 357962