<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211840] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211840">211840</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-07 14:31:48 -0800 (Tue, 07 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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+webkit@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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsGradientjs">trunk/Source/WebInspectorUI/UserInterface/Models/Gradient.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceTesthtml">trunk/Source/WebInspectorUI/UserInterface/Test.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsGradientEditorcss">trunk/Source/WebInspectorUI/UserInterface/Views/GradientEditor.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsGradientEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/GradientEditor.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectormodelgradientexpectedtxt">trunk/LayoutTests/inspector/model/gradient-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelgradienthtml">trunk/LayoutTests/inspector/model/gradient.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211839 => 211840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-07 22:29:57 UTC (rev 211839)
+++ trunk/LayoutTests/ChangeLog 2017-02-07 22:31:48 UTC (rev 211840)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-07 Devin Rousso <dcrousso+webkit@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.
+
</ins><span class="cx"> 2017-02-07 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark media/modern-media-controls/tracks-support/tracks-support-show-panel-after-dragging-controls.html as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelgradientexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/model/gradient-expected.txt (0 => 211840)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+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
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectormodelgradienthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/model/gradient.html (0 => 211840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/gradient.html (rev 0)
+++ trunk/LayoutTests/inspector/model/gradient.html 2017-02-07 22:31:48 UTC (rev 211840)
</span><span class="lines">@@ -0,0 +1,125 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<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>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (211839 => 211840)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2017-02-07 Devin Rousso <dcrousso+webkit@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.
+
</ins><span class="cx"> 2017-02-07 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: DOMTreeOutline becomes collapsed after switching back to Elements tab
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsGradientjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Gradient.js (211839 => 211840)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -85,6 +85,9 @@
</span><span class="cx"> ch++;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (openParentheses !== -1)
+ return null;
+
</ins><span class="cx"> var gradient;
</span><span class="cx"> if (type === WebInspector.Gradient.Types.Linear)
</span><span class="cx"> gradient = WebInspector.LinearGradient.fromComponents(components);
</span><span class="lines">@@ -167,7 +170,7 @@
</span><span class="cx"> constructor(angle, stops)
</span><span class="cx"> {
</span><span class="cx"> super(WebInspector.Gradient.Types.Linear, stops);
</span><del>- this.angle = angle;
</del><ins>+ this._angle = angle;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Static
</span><span class="lines">@@ -174,41 +177,48 @@
</span><span class="cx">
</span><span class="cx"> static fromComponents(components)
</span><span class="cx"> {
</span><del>- var angle = 180;
</del><ins>+ let angle = {value: 180, units: WebInspector.LinearGradient.AngleUnits.DEG};
</ins><span class="cx">
</span><del>- if (components[0].length === 1 && components[0][0].substr(-3) === "deg") {
- angle = (parseFloat(components[0][0]) % 360 + 360) % 360;
</del><ins>+ 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];
+
</ins><span class="cx"> components.shift();
</span><span class="cx"> } else if (components[0][0] === "to") {
</span><span class="cx"> components[0].shift();
</span><span class="cx"> switch (components[0].sort().join(" ")) {
</span><span class="cx"> case "top":
</span><del>- angle = 0;
</del><ins>+ angle.value = 0;
</ins><span class="cx"> break;
</span><span class="cx"> case "right top":
</span><del>- angle = 45;
</del><ins>+ angle.value = 45;
</ins><span class="cx"> break;
</span><span class="cx"> case "right":
</span><del>- angle = 90;
</del><ins>+ angle.value = 90;
</ins><span class="cx"> break;
</span><span class="cx"> case "bottom right":
</span><del>- angle = 135;
</del><ins>+ angle.value = 135;
</ins><span class="cx"> break;
</span><span class="cx"> case "bottom":
</span><del>- angle = 180;
</del><ins>+ angle.value = 180;
</ins><span class="cx"> break;
</span><span class="cx"> case "bottom left":
</span><del>- angle = 225;
</del><ins>+ angle.value = 225;
</ins><span class="cx"> break;
</span><span class="cx"> case "left":
</span><del>- angle = 270;
</del><ins>+ angle.value = 270;
</ins><span class="cx"> break;
</span><span class="cx"> case "left top":
</span><del>- angle = 315;
</del><ins>+ angle.value = 315;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> return null;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> components.shift();
</span><span class="cx"> } else if (components[0].length !== 1 && !WebInspector.Color.fromString(components[0][0])) {
</span><span class="cx"> // If the first component is not a color, then we're dealing with a
</span><span class="lines">@@ -225,31 +235,50 @@
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><ins>+ 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; }
+
</ins><span class="cx"> copy()
</span><span class="cx"> {
</span><del>- return new WebInspector.LinearGradient(this.angle, this.stops.concat());
</del><ins>+ return new WebInspector.LinearGradient(this._angle, this.stops.concat());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> toString()
</span><span class="cx"> {
</span><del>- var str = "";
</del><ins>+ let str = "";
</ins><span class="cx">
</span><del>- if (this.angle === 0)
</del><ins>+ let deg = this._angleValueForUnits(WebInspector.LinearGradient.AngleUnits.DEG);
+ if (deg === 0)
</ins><span class="cx"> str += "to top";
</span><del>- else if (this.angle === 45)
</del><ins>+ else if (deg === 45)
</ins><span class="cx"> str += "to top right";
</span><del>- else if (this.angle === 90)
</del><ins>+ else if (deg === 90)
</ins><span class="cx"> str += "to right";
</span><del>- else if (this.angle === 135)
</del><ins>+ else if (deg === 135)
</ins><span class="cx"> str += "to bottom right";
</span><del>- else if (this.angle === 225)
</del><ins>+ else if (deg === 225)
</ins><span class="cx"> str += "to bottom left";
</span><del>- else if (this.angle === 270)
</del><ins>+ else if (deg === 270)
</ins><span class="cx"> str += "to left";
</span><del>- else if (this.angle === 315)
</del><ins>+ else if (deg === 315)
</ins><span class="cx"> str += "to top left";
</span><del>- else if (this.angle !== 180)
- str += this.angle + "deg";
</del><ins>+ else if (deg !== 180)
+ str += this.angleValue + this.angleUnits;
</ins><span class="cx">
</span><span class="cx"> if (str !== "")
</span><span class="cx"> str += ", ";
</span><span class="lines">@@ -258,8 +287,69 @@
</span><span class="cx">
</span><span class="cx"> return (this.repeats ? "repeating-" : "") + this.type + "(" + str + ")";
</span><span class="cx"> }
</span><ins>+
+ // 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;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.LinearGradient.AngleUnits = {
+ DEG: "deg",
+ RAD: "rad",
+ GRAD: "grad",
+ TURN: "turn",
+};
+
</ins><span class="cx"> WebInspector.RadialGradient = class RadialGradient extends WebInspector.Gradient
</span><span class="cx"> {
</span><span class="cx"> constructor(sizing, stops)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceTesthtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Test.html (211839 => 211840)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> <script src="Models/Frame.js"></script>
</span><span class="cx"> <script src="Models/GarbageCollection.js"></script>
</span><span class="cx"> <script src="Models/Geometry.js"></script>
</span><ins>+ <script src="Models/Gradient.js"></script>
</ins><span class="cx"> <script src="Models/HeapAllocationsInstrument.js"></script>
</span><span class="cx"> <script src="Models/HeapAllocationsTimelineRecord.js"></script>
</span><span class="cx"> <script src="Models/IndexedDatabase.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsGradientEditorcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GradientEditor.css (211839 => 211840)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -88,12 +88,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gradient-editor > .gradient-angle > input[type="range"] {
</span><del>- width: 100%;
</del><ins>+ flex-grow: 1;
+ width: 0;
</ins><span class="cx"> margin: 0 4px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gradient-editor > .gradient-angle > input[type="number"] {
</span><del>- width: 60px;
</del><ins>+ width: 35px;
</ins><span class="cx"> margin-right: 2px;
</span><span class="cx"> padding-right: 4px;
</span><span class="cx"> text-align: right;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsGradientEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GradientEditor.js (211839 => 211840)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -79,21 +79,32 @@
</span><span class="cx"> angleContainerElement.classList.add("gradient-angle");
</span><span class="cx"> angleContainerElement.append(WebInspector.UIString("Angle"));
</span><span class="cx">
</span><del>- let boundAngleChanged = this._angleChanged.bind(this);
</del><ins>+ let boundAngleValueChanged = this._angleValueChanged.bind(this);
</ins><span class="cx">
</span><span class="cx"> this._angleSliderElement = angleContainerElement.appendChild(document.createElement("input"));
</span><span class="cx"> this._angleSliderElement.type = "range";
</span><del>- this._angleSliderElement.min = 0;
- this._angleSliderElement.max = 360;
- this._angleSliderElement.addEventListener("input", boundAngleChanged);
</del><ins>+ this._angleSliderElement.addEventListener("input", boundAngleValueChanged);
</ins><span class="cx">
</span><span class="cx"> this._angleInputElement = angleContainerElement.appendChild(document.createElement("input"));
</span><span class="cx"> this._angleInputElement.type = "number";
</span><del>- this._angleInputElement.min = 0;
- this._angleInputElement.max = 360;
- this._angleInputElement.addEventListener("input", boundAngleChanged);
</del><ins>+ this._angleInputElement.addEventListener("input", boundAngleValueChanged);
</ins><span class="cx">
</span><del>- angleContainerElement.append("deg");
</del><ins>+ 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}];
+ }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get element()
</span><span class="lines">@@ -116,7 +127,8 @@
</span><span class="cx"> this._gradientSlider.stops = this._gradient.stops;
</span><span class="cx"> if (isLinear) {
</span><span class="cx"> this._gradientTypePicker.value = this._gradient.repeats ? "repeating-linear-gradient" : "linear-gradient";
</span><del>- this._angleSliderElement.value = this._angleInputElement.value = this._gradient.angle;
</del><ins>+
+ this._angleUnitsChanged();
</ins><span class="cx"> } else
</span><span class="cx"> this._gradientTypePicker.value = this._gradient.repeats ? "repeating-radial-gradient" : "radial-gradient";
</span><span class="cx">
</span><span class="lines">@@ -175,7 +187,8 @@
</span><span class="cx"> if (!(this._gradient instanceof descriptor.type)) {
</span><span class="cx"> if (descriptor.type === WebInspector.LinearGradient) {
</span><span class="cx"> this._gradient = new WebInspector.LinearGradient(180, this._gradient.stops);
</span><del>- this._angleSliderElement.value = this._angleInputElement.value = 180;
</del><ins>+
+ this._angleUnitsChanged();
</ins><span class="cx"> } else
</span><span class="cx"> this._gradient = new WebInspector.RadialGradient("", this._gradient.stops);
</span><span class="cx">
</span><span class="lines">@@ -194,14 +207,14 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.GradientEditor.Event.GradientChanged, {gradient: this._gradient});
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _angleChanged(event)
</del><ins>+ _angleValueChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> switch (event.target) {
</span><span class="cx"> case this._angleInputElement:
</span><del>- this._gradient.angle = this._angleSliderElement.value = parseFloat(this._angleInputElement.value) || 0;
</del><ins>+ this._gradient.angleValue = this._angleSliderElement.value = parseFloat(this._angleInputElement.value) || 0;
</ins><span class="cx"> break;
</span><span class="cx"> case this._angleSliderElement:
</span><del>- this._gradient.angle = this._angleInputElement.value = parseFloat(this._angleSliderElement.value) || 0;
</del><ins>+ this._gradient.angleValue = this._angleInputElement.value = parseFloat(this._angleSliderElement.value) || 0;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> WebInspector.reportInternalError("Input event fired for disabled color component input");
</span><span class="lines">@@ -210,6 +223,25 @@
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.GradientEditor.Event.GradientChanged, {gradient: this._gradient});
</span><span class="cx"> }
</span><ins>+
+ _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});
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.GradientEditor.Event = {
</span></span></pre>
</div>
</div>
</body>
</html>