Title: [211840] trunk
Revision
211840
Author
commit-qu...@webkit.org
Date
2017-02-07 14:31:48 -0800 (Tue, 07 Feb 2017)

Log Message

Web Inspector: gradient editor should allow switching the units of the 'angle' parameter
https://bugs.webkit.org/show_bug.cgi?id=166938

Patch by Devin Rousso <dcrousso+web...@gmail.com> on 2017-02-07
Reviewed by Brian Burg.

Source/WebInspectorUI:

* UserInterface/Test.html:
Add WebInspector.Gradient for new model object tests.

* UserInterface/Models/Gradient.js:
(WebInspector.Gradient.fromString):
(WebInspector.LinearGradient):
(WebInspector.LinearGradient.fromComponents):
(WebInspector.LinearGradient.prototype.set angleValue):
(WebInspector.LinearGradient.prototype.get angleValue):
(WebInspector.LinearGradient.prototype.set angleUnits):
(WebInspector.LinearGradient.prototype.get angleUnits):
(WebInspector.LinearGradient.prototype.copy):
(WebInspector.LinearGradient.prototype.toString):
(WebInspector.LinearGradient.prototype._angleValueForUnits):
Rework part of WebInspector.LinearGradient to support units other than "deg".

* UserInterface/Views/GradientEditor.css:
(.gradient-editor > .gradient-angle > input[type="range"]):
(.gradient-editor > .gradient-angle > input[type="number"]):

* UserInterface/Views/GradientEditor.js:
(WebInspector.GradientEditor):
(WebInspector.GradientEditor.prototype.set gradient):
(WebInspector.GradientEditor.prototype._gradientTypeChanged):
(WebInspector.GradientEditor.prototype._angleValueChanged):
(WebInspector.GradientEditor.prototype._angleUnitsChanged):
(WebInspector.GradientEditor.prototype._angleChanged): Deleted.
Add <select> for each unit type that will change the units of the gradient.

LayoutTests:

* inspector/model/gradient-expected.txt: Added.
* inspector/model/gradient.html: Added.
New tests for WebInspector.Gradient.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (211839 => 211840)


--- trunk/LayoutTests/ChangeLog	2017-02-07 22:29:57 UTC (rev 211839)
+++ trunk/LayoutTests/ChangeLog	2017-02-07 22:31:48 UTC (rev 211840)
@@ -1,3 +1,14 @@
+2017-02-07  Devin Rousso  <dcrousso+web...@gmail.com>
+
+        Web Inspector: gradient editor should allow switching the units of the 'angle' parameter
+        https://bugs.webkit.org/show_bug.cgi?id=166938
+
+        Reviewed by Brian Burg.
+
+        * inspector/model/gradient-expected.txt: Added.
+        * inspector/model/gradient.html: Added.
+        New tests for WebInspector.Gradient.
+
 2017-02-07  Ryan Haddad  <ryanhad...@apple.com>
 
         Mark media/modern-media-controls/tracks-support/tracks-support-show-panel-after-dragging-controls.html as flaky.

Added: trunk/LayoutTests/inspector/model/gradient-expected.txt (0 => 211840)


--- trunk/LayoutTests/inspector/model/gradient-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/inspector/model/gradient-expected.txt	2017-02-07 22:31:48 UTC (rev 211840)
@@ -0,0 +1,71 @@
+Tests for the WebInspector.Gradient model object.
+
+
+== Running test suite: WebInspector.Gradient
+-- Running test case: WebInspector.Gradient.fromString
+PASS: 'linear-gradient(red, blue)' is valid
+PASS: 'linear-gradient(red, blue)' is the expected subclass 'LinearGradient'
+PASS: 'linear-gradient(0deg, red, blue)' is valid
+PASS: 'linear-gradient(0deg, red, blue)' is the expected subclass 'LinearGradient'
+PASS: 'linear-gradient(to top, red, blue)' is valid
+PASS: 'linear-gradient(to top, red, blue)' is the expected subclass 'LinearGradient'
+PASS: 'linear-gradient(to top, red, green 50%, blue)' is valid
+PASS: 'linear-gradient(to top, red, green 50%, blue)' is the expected subclass 'LinearGradient'
+PASS: 'repeating-linear-gradient(0deg, red, blue)' is valid
+PASS: 'repeating-linear-gradient(0deg, red, blue)' is the expected subclass 'LinearGradient'
+PASS: 'radial-gradient(red, blue)' is valid
+PASS: 'radial-gradient(red, blue)' is the expected subclass 'RadialGradient'
+PASS: 'radial-gradient(0deg, red, blue)' is valid
+PASS: 'radial-gradient(0deg, red, blue)' is the expected subclass 'RadialGradient'
+PASS: 'radial-gradient(ellipse, red, blue)' is valid
+PASS: 'radial-gradient(ellipse, red, blue)' is the expected subclass 'RadialGradient'
+PASS: 'radial-gradient(ellipse, red, green 50%, blue)' is valid
+PASS: 'radial-gradient(ellipse, red, green 50%, blue)' is the expected subclass 'RadialGradient'
+PASS: 'repeating-radial-gradient(red, blue)' is valid
+PASS: 'repeating-radial-gradient(red, blue)' is the expected subclass 'RadialGradient'
+
+PASS: 'bad' is not valid
+PASS: 'linear-gradient' is not valid
+PASS: 'linear-gradient()' is not valid
+PASS: 'linear-gradient(0, red)' is not valid
+PASS: 'linear-gradient(0, red, blue)' is not valid
+PASS: 'linear-gradient(to, red, blue)' is not valid
+PASS: 'linear-gradient(0deg, red, blue' is not valid
+PASS: 'linear-gradient(0deg, red, blue,)' is not valid
+PASS: 'radial-gradient' is not valid
+PASS: 'radial-gradient()' is not valid
+PASS: 'radial-gradient(red, blue' is not valid
+PASS: 'radial-gradient(red, blue,)' is not valid
+
+-- Running test case: WebInspector.Gradient.prototype.toString
+PASS: 'linear-gradient(0deg, red, blue)' is valid
+PASS: toString() output matches 'linear-gradient(to top, red, blue)'
+PASS: 'linear-gradient(to top, red, blue)' is valid
+PASS: toString() output matches 'linear-gradient(to top, red, blue)'
+PASS: 'linear-gradient(30deg, red, blue)' is valid
+PASS: toString() output matches 'linear-gradient(30deg, red, blue)'
+PASS: 'repeating-linear-gradient(red, blue)' is valid
+PASS: toString() output matches 'repeating-linear-gradient(red, blue)'
+PASS: 'radial-gradient(red, blue)' is valid
+PASS: toString() output matches 'radial-gradient(red, blue)'
+PASS: 'radial-gradient(30deg, red, blue)' is valid
+PASS: toString() output matches 'radial-gradient(30deg, red, blue)'
+PASS: 'radial-gradient(ellipse, red, blue)' is valid
+PASS: toString() output matches 'radial-gradient(ellipse, red, blue)'
+PASS: 'repeating-radial-gradient(red, blue)' is valid
+PASS: toString() output matches 'repeating-radial-gradient(red, blue)'
+
+-- Running test case: WebInspector.LinearGradient.prototype.set angleUnits
+PASS: Gradient has angle value of '180'
+PASS: Gradient has angle units of 'deg'
+PASS: toString() returns the same value regardless of angle units
+PASS: Gradient has angle value of '3.14'
+PASS: Gradient has angle units of 'rad'
+PASS: toString() returns the same value regardless of angle units
+PASS: Gradient has angle value of '200'
+PASS: Gradient has angle units of 'grad'
+PASS: toString() returns the same value regardless of angle units
+PASS: Gradient has angle value of '0.5'
+PASS: Gradient has angle units of 'turn'
+PASS: toString() returns the same value regardless of angle units
+

Added: trunk/LayoutTests/inspector/model/gradient.html (0 => 211840)


--- trunk/LayoutTests/inspector/model/gradient.html	                        (rev 0)
+++ trunk/LayoutTests/inspector/model/gradient.html	2017-02-07 22:31:48 UTC (rev 211840)
@@ -0,0 +1,125 @@
+<!doctype html>
+<html>
+<head>
+<script src=""
+<script>
+function test()
+{
+    let suite = InspectorTest.createAsyncSuite("WebInspector.Gradient");
+
+    suite.addTestCase({
+        name: "WebInspector.Gradient.fromString",
+        description: "Test we can detect gradients from strings.",
+        test(resolve, reject) {
+            function testGood(string, expectedSubclass) {
+                let gradient = WebInspector.Gradient.fromString(string);
+                InspectorTest.expectThat(gradient instanceof WebInspector.Gradient, `'${string}' is valid`);
+                InspectorTest.expectThat(gradient && gradient instanceof expectedSubclass, `'${string}' is the expected subclass '${expectedSubclass.name}'`);
+            }
+
+            function testBad(string) {
+                let gradient = WebInspector.Gradient.fromString(string);
+                InspectorTest.expectThat(!gradient, `'${string}' is not valid`);
+                if (gradient)
+                    InspectorTest.fail(`'${string}' is valid with subclass '${gradient.constructor.name}'`);
+            }
+
+            testGood("linear-gradient(red, blue)", WebInspector.LinearGradient);
+            testGood("linear-gradient(0deg, red, blue)", WebInspector.LinearGradient);
+            testGood("linear-gradient(to top, red, blue)", WebInspector.LinearGradient);
+            testGood("linear-gradient(to top, red, green 50%, blue)", WebInspector.LinearGradient);
+            testGood("repeating-linear-gradient(0deg, red, blue)", WebInspector.LinearGradient);
+
+            testGood("radial-gradient(red, blue)", WebInspector.RadialGradient);
+            testGood("radial-gradient(0deg, red, blue)", WebInspector.RadialGradient);
+            testGood("radial-gradient(ellipse, red, blue)", WebInspector.RadialGradient);
+            testGood("radial-gradient(ellipse, red, green 50%, blue)", WebInspector.RadialGradient);
+            testGood("repeating-radial-gradient(red, blue)", WebInspector.RadialGradient);
+
+            InspectorTest.log("");
+
+            testBad("bad");
+
+            testBad("linear-gradient");
+            testBad("linear-gradient()");
+            testBad("linear-gradient(0, red)");
+            testBad("linear-gradient(0, red, blue)");
+            testBad("linear-gradient(to, red, blue)");
+            testBad("linear-gradient(0deg, red, blue");
+            testBad("linear-gradient(0deg, red, blue,)");
+
+            testBad("radial-gradient");
+            testBad("radial-gradient()");
+            testBad("radial-gradient(red, blue");
+            testBad("radial-gradient(red, blue,)");
+
+            resolve();
+        }
+    });
+
+    suite.addTestCase({
+        name: "WebInspector.Gradient.prototype.toString",
+        description: "Test the different toString outputs.",
+        test(resolve, reject) {
+            function test(string, expected = string) {
+                let gradient = WebInspector.Gradient.fromString(string);
+                InspectorTest.expectThat(gradient instanceof WebInspector.Gradient, `'${string}' is valid`);
+                InspectorTest.expectEqual(gradient && gradient.toString(), expected, `toString() output matches '${expected}'`);
+            }
+
+            test("linear-gradient(0deg, red, blue)", "linear-gradient(to top, red, blue)");
+            test("linear-gradient(to top, red, blue)");
+            test("linear-gradient(30deg, red, blue)");
+            test("repeating-linear-gradient(red, blue)");
+
+            test("radial-gradient(red, blue)");
+            test("radial-gradient(30deg, red, blue)");
+            test("radial-gradient(ellipse, red, blue)");
+            test("repeating-radial-gradient(red, blue)");
+
+            resolve();
+        }
+    });
+
+    suite.addTestCase({
+        name: "WebInspector.LinearGradient.prototype.set angleUnits",
+        description: "Test the recalculation of the angle value when changing angle units.",
+        test(resolve, reject) {
+            let gradient = WebInspector.Gradient.fromString("linear-gradient(red, blue)");
+            if (!gradient) {
+                InspectorTest.fail("'linear-gradient(red, blue)' is not valid");
+                reject();
+            }
+
+            function test(angleValue, angleUnits) {
+                InspectorTest.expectEqual(gradient.angleValue, angleValue, `Gradient has angle value of '${angleValue}'`);
+                InspectorTest.expectEqual(gradient.angleUnits, angleUnits, `Gradient has angle units of '${angleUnits}'`);
+                InspectorTest.expectEqual(gradient.toString(), "linear-gradient(red, blue)", "toString() returns the same value regardless of angle units");
+            }
+
+            test(180, WebInspector.LinearGradient.AngleUnits.DEG);
+
+            gradient.angleUnits = WebInspector.LinearGradient.AngleUnits.RAD;
+
+            test(3.14, WebInspector.LinearGradient.AngleUnits.RAD);
+
+            gradient.angleUnits = WebInspector.LinearGradient.AngleUnits.GRAD;
+
+            test(200, WebInspector.LinearGradient.AngleUnits.GRAD);
+
+            gradient.angleUnits = WebInspector.LinearGradient.AngleUnits.TURN;
+
+            test(0.5, WebInspector.LinearGradient.AngleUnits.TURN);
+
+            resolve();
+        }
+    });
+
+    suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Tests for the WebInspector.Gradient model object.</p>
+</body>
+</html>

Modified: trunk/Source/WebInspectorUI/ChangeLog (211839 => 211840)


--- trunk/Source/WebInspectorUI/ChangeLog	2017-02-07 22:29:57 UTC (rev 211839)
+++ trunk/Source/WebInspectorUI/ChangeLog	2017-02-07 22:31:48 UTC (rev 211840)
@@ -1,3 +1,39 @@
+2017-02-07  Devin Rousso  <dcrousso+web...@gmail.com>
+
+        Web Inspector: gradient editor should allow switching the units of the 'angle' parameter
+        https://bugs.webkit.org/show_bug.cgi?id=166938
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Test.html:
+        Add WebInspector.Gradient for new model object tests.
+
+        * UserInterface/Models/Gradient.js:
+        (WebInspector.Gradient.fromString):
+        (WebInspector.LinearGradient):
+        (WebInspector.LinearGradient.fromComponents):
+        (WebInspector.LinearGradient.prototype.set angleValue):
+        (WebInspector.LinearGradient.prototype.get angleValue):
+        (WebInspector.LinearGradient.prototype.set angleUnits):
+        (WebInspector.LinearGradient.prototype.get angleUnits):
+        (WebInspector.LinearGradient.prototype.copy):
+        (WebInspector.LinearGradient.prototype.toString):
+        (WebInspector.LinearGradient.prototype._angleValueForUnits):
+        Rework part of WebInspector.LinearGradient to support units other than "deg".
+
+        * UserInterface/Views/GradientEditor.css:
+        (.gradient-editor > .gradient-angle > input[type="range"]):
+        (.gradient-editor > .gradient-angle > input[type="number"]):
+
+        * UserInterface/Views/GradientEditor.js:
+        (WebInspector.GradientEditor):
+        (WebInspector.GradientEditor.prototype.set gradient):
+        (WebInspector.GradientEditor.prototype._gradientTypeChanged):
+        (WebInspector.GradientEditor.prototype._angleValueChanged):
+        (WebInspector.GradientEditor.prototype._angleUnitsChanged):
+        (WebInspector.GradientEditor.prototype._angleChanged): Deleted.
+        Add <select> for each unit type that will change the units of the gradient.
+
 2017-02-07  Matt Baker  <mattba...@apple.com>
 
         Web Inspector: DOMTreeOutline becomes collapsed after switching back to Elements tab

Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Gradient.js (211839 => 211840)


--- trunk/Source/WebInspectorUI/UserInterface/Models/Gradient.js	2017-02-07 22:29:57 UTC (rev 211839)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Gradient.js	2017-02-07 22:31:48 UTC (rev 211840)
@@ -85,6 +85,9 @@
             ch++;
         }
 
+        if (openParentheses !== -1)
+            return null;
+
         var gradient;
         if (type === WebInspector.Gradient.Types.Linear)
             gradient = WebInspector.LinearGradient.fromComponents(components);
@@ -167,7 +170,7 @@
     constructor(angle, stops)
     {
         super(WebInspector.Gradient.Types.Linear, stops);
-        this.angle = angle;
+        this._angle = angle;
     }
 
     // Static
@@ -174,41 +177,48 @@
 
     static fromComponents(components)
     {
-        var angle = 180;
+        let angle = {value: 180, units: WebInspector.LinearGradient.AngleUnits.DEG};
 
-        if (components[0].length === 1 && components[0][0].substr(-3) === "deg") {
-            angle = (parseFloat(components[0][0]) % 360 + 360) % 360;
+        if (components[0].length === 1 && !WebInspector.Color.fromString(components[0][0])) {
+            let match = components[0][0].match(/([-\d\.]+)(\w+)/);
+            if (!match || !Object.values(WebInspector.LinearGradient.AngleUnits).includes(match[2]))
+                return null;
+
+            angle.value = parseFloat(match[1]);
+            angle.units = match[2];
+
             components.shift();
         } else if (components[0][0] === "to") {
             components[0].shift();
             switch (components[0].sort().join(" ")) {
             case "top":
-                angle = 0;
+                angle.value = 0;
                 break;
             case "right top":
-                angle = 45;
+                angle.value = 45;
                 break;
             case "right":
-                angle = 90;
+                angle.value = 90;
                 break;
             case "bottom right":
-                angle = 135;
+                angle.value = 135;
                 break;
             case "bottom":
-                angle = 180;
+                angle.value = 180;
                 break;
             case "bottom left":
-                angle = 225;
+                angle.value = 225;
                 break;
             case "left":
-                angle = 270;
+                angle.value = 270;
                 break;
             case "left top":
-                angle = 315;
+                angle.value = 315;
                 break;
             default:
                 return null;
             }
+
             components.shift();
         } else if (components[0].length !== 1 && !WebInspector.Color.fromString(components[0][0])) {
             // If the first component is not a color, then we're dealing with a
@@ -225,31 +235,50 @@
 
     // Public
 
+    set angleValue(value) { this._angle.value = value; }
+
+    get angleValue()
+    {
+        return this._angle.value.maxDecimals(2);
+    }
+
+    set angleUnits(units)
+    {
+        if (units === this._angle.units)
+            return;
+
+        this._angle.value = this._angleValueForUnits(units);
+        this._angle.units = units;
+    }
+
+    get angleUnits() { return this._angle.units; }
+
     copy()
     {
-        return new WebInspector.LinearGradient(this.angle, this.stops.concat());
+        return new WebInspector.LinearGradient(this._angle, this.stops.concat());
     }
 
     toString()
     {
-        var str = "";
+        let str = "";
 
-        if (this.angle === 0)
+        let deg = this._angleValueForUnits(WebInspector.LinearGradient.AngleUnits.DEG);
+        if (deg === 0)
             str += "to top";
-        else if (this.angle === 45)
+        else if (deg === 45)
             str += "to top right";
-        else if (this.angle === 90)
+        else if (deg === 90)
             str += "to right";
-        else if (this.angle === 135)
+        else if (deg === 135)
             str += "to bottom right";
-        else if (this.angle === 225)
+        else if (deg === 225)
             str += "to bottom left";
-        else if (this.angle === 270)
+        else if (deg === 270)
             str += "to left";
-        else if (this.angle === 315)
+        else if (deg === 315)
             str += "to top left";
-        else if (this.angle !== 180)
-            str += this.angle + "deg";
+        else if (deg !== 180)
+            str += this.angleValue + this.angleUnits;
 
         if (str !== "")
             str += ", ";
@@ -258,8 +287,69 @@
 
         return (this.repeats ? "repeating-" : "") + this.type + "(" + str + ")";
     }
+
+    // Private
+
+    _angleValueForUnits(units)
+    {
+        if (units === this._angle.units)
+            return this._angle.value;
+
+        let deg = 0;
+
+        switch (this._angle.units) {
+        case WebInspector.LinearGradient.AngleUnits.DEG:
+            deg = this._angle.value;
+            break;
+
+        case WebInspector.LinearGradient.AngleUnits.RAD:
+            deg = this._angle.value * 180 / Math.PI;
+            break;
+
+        case WebInspector.LinearGradient.AngleUnits.GRAD:
+            deg = this._angle.value / 400 * 360;
+            break;
+
+        case WebInspector.LinearGradient.AngleUnits.TURN:
+            deg = this._angle.value * 360;
+            break;
+
+        default:
+            WebInspector.reportInternalError(`Unknown angle units "${this._angle.units}"`);
+            return 0;
+        }
+
+        let value = 0;
+
+        switch (units) {
+        case WebInspector.LinearGradient.AngleUnits.DEG:
+            value = deg;
+            break;
+
+        case WebInspector.LinearGradient.AngleUnits.RAD:
+            value = deg * Math.PI / 180;
+            break;
+
+        case WebInspector.LinearGradient.AngleUnits.GRAD:
+            value = deg / 360 * 400;
+            break;
+
+        case WebInspector.LinearGradient.AngleUnits.TURN:
+            value = deg / 360;
+            break;
+        }
+
+        return value;
+    }
 };
 
+WebInspector.LinearGradient.AngleUnits = {
+    DEG: "deg",
+    RAD: "rad",
+    GRAD: "grad",
+    TURN: "turn",
+};
+
 WebInspector.RadialGradient = class RadialGradient extends WebInspector.Gradient
 {
     constructor(sizing, stops)

Modified: trunk/Source/WebInspectorUI/UserInterface/Test.html (211839 => 211840)


--- trunk/Source/WebInspectorUI/UserInterface/Test.html	2017-02-07 22:29:57 UTC (rev 211839)
+++ trunk/Source/WebInspectorUI/UserInterface/Test.html	2017-02-07 22:31:48 UTC (rev 211840)
@@ -123,6 +123,7 @@
     <script src=""
     <script src=""
     <script src=""
+    <script src=""
     <script src=""
     <script src=""
     <script src=""

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GradientEditor.css (211839 => 211840)


--- trunk/Source/WebInspectorUI/UserInterface/Views/GradientEditor.css	2017-02-07 22:29:57 UTC (rev 211839)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/GradientEditor.css	2017-02-07 22:31:48 UTC (rev 211840)
@@ -88,12 +88,13 @@
 }
 
 .gradient-editor > .gradient-angle > input[type="range"] {
-    width: 100%;
+    flex-grow: 1;
+    width: 0;
     margin: 0 4px;
 }
 
 .gradient-editor > .gradient-angle > input[type="number"] {
-    width: 60px;
+    width: 35px;
     margin-right: 2px;
     padding-right: 4px;
     text-align: right;

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GradientEditor.js (211839 => 211840)


--- trunk/Source/WebInspectorUI/UserInterface/Views/GradientEditor.js	2017-02-07 22:29:57 UTC (rev 211839)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/GradientEditor.js	2017-02-07 22:31:48 UTC (rev 211840)
@@ -79,21 +79,32 @@
         angleContainerElement.classList.add("gradient-angle");
         angleContainerElement.append(WebInspector.UIString("Angle"));
 
-        let boundAngleChanged = this._angleChanged.bind(this);
+        let boundAngleValueChanged = this._angleValueChanged.bind(this);
 
         this._angleSliderElement = angleContainerElement.appendChild(document.createElement("input"));
         this._angleSliderElement.type = "range";
-        this._angleSliderElement.min = 0;
-        this._angleSliderElement.max = 360;
-        this._angleSliderElement.addEventListener("input", boundAngleChanged);
+        this._angleSliderElement.addEventListener("input", boundAngleValueChanged);
 
         this._angleInputElement = angleContainerElement.appendChild(document.createElement("input"));
         this._angleInputElement.type = "number";
-        this._angleInputElement.min = 0;
-        this._angleInputElement.max = 360;
-        this._angleInputElement.addEventListener("input", boundAngleChanged);
+        this._angleInputElement.addEventListener("input", boundAngleValueChanged);
 
-        angleContainerElement.append("deg");
+        this._angleUnitsSelectElement = angleContainerElement.appendChild(document.createElement("select"));
+        this._angleUnitsSelectElement.addEventListener("change", this._angleUnitsChanged.bind(this));
+
+        const angleUnitsData = [
+            {name: WebInspector.LinearGradient.AngleUnits.DEG, min: 0, max: 360, step: 1},
+            {name: WebInspector.LinearGradient.AngleUnits.RAD, min: 0, max: 2 * Math.PI, step: 0.01},
+            {name: WebInspector.LinearGradient.AngleUnits.GRAD, min: 0, max: 400, step: 1},
+            {name: WebInspector.LinearGradient.AngleUnits.TURN, min: 0, max: 1, step: 0.01}
+        ];
+
+        this._angleUnitsConfiguration = new Map(angleUnitsData.map(({name, min, max, step}) => {
+            let optionElement = this._angleUnitsSelectElement.appendChild(document.createElement("option"));
+            optionElement.value = optionElement.textContent = name;
+
+            return [name, {element: optionElement, min, max, step}];
+        }));
     }
 
     get element()
@@ -116,7 +127,8 @@
         this._gradientSlider.stops = this._gradient.stops;
         if (isLinear) {
             this._gradientTypePicker.value = this._gradient.repeats ? "repeating-linear-gradient" : "linear-gradient";
-            this._angleSliderElement.value = this._angleInputElement.value = this._gradient.angle;
+
+            this._angleUnitsChanged();
         } else
             this._gradientTypePicker.value = this._gradient.repeats ? "repeating-radial-gradient" : "radial-gradient";
 
@@ -175,7 +187,8 @@
         if (!(this._gradient instanceof descriptor.type)) {
             if (descriptor.type === WebInspector.LinearGradient) {
                 this._gradient = new WebInspector.LinearGradient(180, this._gradient.stops);
-                this._angleSliderElement.value = this._angleInputElement.value = 180;
+
+                this._angleUnitsChanged();
             } else
                 this._gradient = new WebInspector.RadialGradient("", this._gradient.stops);
 
@@ -194,14 +207,14 @@
         this.dispatchEventToListeners(WebInspector.GradientEditor.Event.GradientChanged, {gradient: this._gradient});
     }
 
-    _angleChanged(event)
+    _angleValueChanged(event)
     {
         switch (event.target) {
         case this._angleInputElement:
-            this._gradient.angle = this._angleSliderElement.value = parseFloat(this._angleInputElement.value) || 0;
+            this._gradient.angleValue = this._angleSliderElement.value = parseFloat(this._angleInputElement.value) || 0;
             break;
         case this._angleSliderElement:
-            this._gradient.angle = this._angleInputElement.value = parseFloat(this._angleSliderElement.value) || 0;
+            this._gradient.angleValue = this._angleInputElement.value = parseFloat(this._angleSliderElement.value) || 0;
             break;
         default:
             WebInspector.reportInternalError("Input event fired for disabled color component input");
@@ -210,6 +223,25 @@
 
         this.dispatchEventToListeners(WebInspector.GradientEditor.Event.GradientChanged, {gradient: this._gradient});
     }
+
+    _angleUnitsChanged(event)
+    {
+        let units = this._angleUnitsSelectElement.value;
+        let configuration = this._angleUnitsConfiguration.get(units);
+        if (!configuration) {
+            WebInspector.reportInternalError(`Missing configuration data for selected angle units "${units}"`);
+            return;
+        }
+
+        this._gradient.angleUnits = units;
+
+        this._angleInputElement.min = this._angleSliderElement.min = configuration.min;
+        this._angleInputElement.max = this._angleSliderElement.max = configuration.max;
+        this._angleInputElement.step = this._angleSliderElement.step = configuration.step;
+        this._angleInputElement.value = this._angleSliderElement.value = this._gradient.angleValue;
+
+        this.dispatchEventToListeners(WebInspector.GradientEditor.Event.GradientChanged, {gradient: this._gradient});
+    }
 };
 
 WebInspector.GradientEditor.Event = {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to