Attachment 349841 Details for Bug 189640 – Patch

[patch] Patch

bug-189640-20180914174841.patch (text/plain), 6.12 KB, created by Megan Gardner on 2018-09-14 17:48:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Megan Gardner

Created: 2018-09-14 17:48:41 PDT

Size: 6.12 KB

patch

obsolete

>Subversion Revision: 236028
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c0a979bedbc07218cd428bbc4af0d4a90b549a19..27151b32dc36edb40befc8c0042f7d44ac084018 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-09-14  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Support two color hints per color stop for angle based gradients
>+        https://bugs.webkit.org/show_bug.cgi?id=189640
>+        <rdar://problem/44158152>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The CSS spec for conic gradients allows for each color stop to have two angles to be used for hints.
>+        This makes pie chart and checkerboard gradients much simpler to write.
>+
>+        Test: fast/gradients/conic-two-hints.html
>+
>+        * css/parser/CSSPropertyParserHelpers.cpp:
>+        (WebCore::CSSPropertyParserHelpers::consumeAngularGradientColorStops):
>+
> 2018-09-14  Justin Fan  <justin_fan@apple.com>
> 
>         WebGL 2 conformance: rgb-format-support.html
>diff --git a/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp b/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
>index 98ffc21b5d5657e727ebfb1d586a8102cf47f2f6..7a4e058e1997b3cb6b068aa59a0737118afb2438 100644
>--- a/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
>+++ b/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
>@@ -1018,6 +1018,15 @@ static bool consumeAngularGradientColorStops(CSSParserTokenRange& range, CSSPars
>         if (!stop.m_color && !stop.m_position)
>             return false;
>         gradient.addStop(stop);
>+        
>+        // See if there is a second color hint, which is optional.
>+        CSSGradientColorStop secondStop;
>+        secondStop.m_position = consumeAngleOrPercent(range, cssParserMode, ValueRangeAll, UnitlessQuirk::Forbid);
>+        if (secondStop.m_position) {
>+            secondStop.m_color = stop.m_color;
>+            gradient.addStop(secondStop);
>+        }
>+        
>     } while (consumeCommaIncludingWhitespace(range));
> 
>     gradient.doneAddingStops();
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 00680933dc25f1a43c7ddbe121b8598908307d85..392eb110e15b7db073a89f642c05244c2372e59e 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-09-14  Megan Gardner  <megan_gardner@apple.com>
>+
>+        Support two color hints per color stop for angle based gradients
>+        https://bugs.webkit.org/show_bug.cgi?id=189640
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test that uses two angles per color stop.
>+
>+        * TestExpectations:
>+        * fast/gradients/conic-two-hints-expected.html: Added.
>+        * fast/gradients/conic-two-hints.html: Added.
>+        * platform/ios-12/TestExpectations:
>+        * platform/mac/TestExpectations:
>+
> 2018-09-14  Megan Gardner  <megan_gardner@apple.com>
> 
>         Additional tests for conic gradients
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 07acdf01943d0dd9fe9e07e93fdf1437c80580c2..5786c1b366c2ab44027bf7b6efe10e28424e4d7f 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -2246,5 +2246,6 @@ fast/gradients/conic-repeating-last-stop.html [ Skip ]
> fast/gradients/conic-gradient-alpha.html [ Skip ]
> fast/gradients/conic-gradient-extended-stops.html [ Skip ]
> fast/gradients/conic-gradient.html [ Skip ]
>+fast/gradients/conic-two-hints.html [ Skip ]
> 
> webkit.org/b/187773 http/tests/webAPIStatistics [ Skip ]
>diff --git a/LayoutTests/fast/gradients/conic-two-hints-expected.html b/LayoutTests/fast/gradients/conic-two-hints-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..7b71df1ae38616a31cbdfb04b732cc94400a8175
>--- /dev/null
>+++ b/LayoutTests/fast/gradients/conic-two-hints-expected.html
>@@ -0,0 +1,33 @@
>+<html>
>+<head>
>+    <style>
>+        div {
>+            float: left;
>+        }
>+
>+        #box1 {
>+            height: 50px;
>+            width: 25px;
>+            background-color: orange;
>+        }
>+        #box2 {
>+            height: 25px;
>+            width: 25px;
>+            background-color: blue;
>+        }
>+        #box3 {
>+            height: 25px;
>+            width: 25px;
>+            clear: left;
>+            background-color: green;
>+        }
>+    </style>
>+</head>
>+<body>
>+    <div id="box1"></div>
>+    <div id="container">
>+        <div id="box2"></div>
>+        <div id="box3"></div>
>+    </div>
>+</body>
>+</html>
>diff --git a/LayoutTests/fast/gradients/conic-two-hints.html b/LayoutTests/fast/gradients/conic-two-hints.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..43928120a6f859e5a3410554fe0a3370bf035f98
>--- /dev/null
>+++ b/LayoutTests/fast/gradients/conic-two-hints.html
>@@ -0,0 +1,14 @@
>+<html>
>+<head>
>+    <style>
>+        #grad {
>+            height: 50px;
>+            width: 50px;
>+            background: conic-gradient(blue 0deg 90deg, green 90deg 180deg, orange 180deg 360deg);
>+        }
>+    </style>
>+</head>
>+<body>
>+    <div id="grad"></div>
>+</body>
>+</html>
>diff --git a/LayoutTests/platform/ios-12/TestExpectations b/LayoutTests/platform/ios-12/TestExpectations
>index 05511e5f2acf036f17c8041d982ce0762b2358f9..05f74a80b0451d103c8d9c13e132bac51fd64be5 100644
>--- a/LayoutTests/platform/ios-12/TestExpectations
>+++ b/LayoutTests/platform/ios-12/TestExpectations
>@@ -37,4 +37,4 @@ fast/gradients/conic-repeating-last-stop.html [ Pass ]
> fast/gradients/conic-gradient-alpha.html [ Pass ]
> fast/gradients/conic-gradient-extended-stops.html [ Pass ]
> fast/gradients/conic-gradient.html [ Pass ]
>-
>+fast/gradients/conic-two-hints.html [ Pass ]
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index 88f1ec8c91048e5cf121c2db8646f161e937d5f0..4722cdb46095eb14aa29aa49aab7bc2c92161ba9 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -1767,5 +1767,6 @@ webkit.org/b/187393 imported/w3c/web-platform-tests/2dcontext/imagebitmap/create
> [ Mojave+ ] fast/gradients/conic-gradient-alpha.html [ Pass ]
> [ Mojave+ ] fast/gradients/conic-gradient-extended-stops.html [ Pass ]
> [ Mojave+ ] fast/gradients/conic-gradient.html [ Pass ]
>+[ Mojave+ ] fast/gradients/conic-two-hints.html [ Pass ]
> 
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189640: 349835 | 349841 | 349964