-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Web Inspector: give
WI.StepsFunction a better name and move it to i…
…ts own file https://bugs.webkit.org/show_bug.cgi?id=259503 Reviewed by Timothy Hatcher and Tim Nguyen. `WI.StepsFunction` should really be named `WI.StepsTimingFunction` to convey it's true purpose. It also shouldn't really be in `Source/WebInspectorUI/UserInterface/Models/Geometry.js` since it has nothing to do with geometry. * Source/WebInspectorUI/UserInterface/Models/StepsTimingFunction.js: Added. (WI.StepsTimingFunction): (WI.StepsTimingFunction.fromString): (WI.StepsTimingFunction.prototype.get type): (WI.StepsTimingFunction.prototype.get count): (WI.StepsTimingFunction.prototype.copy): (WI.StepsTimingFunction.prototype.toString): * Source/WebInspectorUI/UserInterface/Models/Geometry.js: (WI.Spring): (WI.StepsFunction): Deleted. (WI.StepsFunction.fromString): Deleted. (WI.StepsFunction.prototype.get type): Deleted. (WI.StepsFunction.prototype.get count): Deleted. (WI.StepsFunction.prototype.copy): Deleted. (WI.StepsFunction.prototype.toString): Deleted. * Source/WebInspectorUI/UserInterface/Models/Animation.js: (WI.Animation.prototype._updateEffect): * Source/WebInspectorUI/UserInterface/Views/AnimationContentView.js: (WI.AnimationContentView.prototype._refreshPreview): * Source/WebInspectorUI/UserInterface/Main.html: * Source/WebInspectorUI/UserInterface/Test.html: * LayoutTests/inspector/animation/resources/lifecycle-utilities.js: * LayoutTests/inspector/unit-tests/geometry.html: * LayoutTests/inspector/unit-tests/geometry-expected.txt: * LayoutTests/inspector/unit-tests/steps-timing-function.html: Added. * LayoutTests/inspector/unit-tests/steps-timing-function-expected.txt: Added. Canonical link: https://commits.webkit.org/266345@main
- Loading branch information
Showing
10 changed files
with
169 additions
and
136 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
LayoutTests/inspector/unit-tests/steps-timing-function.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <script src="../../http/tests/inspector/resources/inspector-test.js"></script> | ||
| <script> | ||
| function test() { | ||
| let suite = InspectorTest.createSyncSuite("WI.StepsTimingFunction"); | ||
|
|
||
| suite.addTestCase({ | ||
| name: "WI.StepsTimingFunction.fromString.Valid", | ||
| test() { | ||
| let test = (inputString, expectedString) => { | ||
| expectedString ||= inputString; | ||
| InspectorTest.expectEqual(WI.StepsTimingFunction.fromString(inputString).toString(), expectedString, `Should parse '${inputString}' as '${expectedString}'.`); | ||
| }; | ||
|
|
||
| test("steps(1)", "step-end"); | ||
| test("steps(2, jump-start)"); | ||
| test("steps(3, jump-end)"); | ||
| test("steps(4, jump-none)"); | ||
| test("steps(5, jump-both)"); | ||
| test("steps(6, end)"); | ||
| test("steps(7, start)"); | ||
| test("step-start"); | ||
| test("step-end"); | ||
| }, | ||
| }); | ||
|
|
||
| suite.addTestCase({ | ||
| name: "WI.StepsTimingFunction.fromString.Invalid", | ||
| test() { | ||
| let test = (inputString) => { | ||
| InspectorTest.expectNull(WI.StepsTimingFunction.fromString(inputString), `Should not parse invalid '${inputString}'.`); | ||
| }; | ||
|
|
||
| test("steps()"); | ||
| test("steps(0)"); | ||
| test("steps(0, 1)"); | ||
| test("steps(0, 1, 2)"); | ||
| test("steps(\"test\")"); | ||
| test("steps(0, \"test\")"); | ||
| test("steps(0, 1, \"test\")"); | ||
| }, | ||
| }); | ||
|
|
||
| suite.runTestCasesAndFinish(); | ||
| } | ||
| </script> | ||
| </head> | ||
| <body onload="runTest()"> | ||
| <p>Tests for WI.StepsTimingFunction.</p> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
Source/WebInspectorUI/UserInterface/Models/StepsTimingFunction.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * Copyright (C) 2013 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| * THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| WI.StepsTimingFunction = class StepsTimingFunction | ||
| { | ||
| constructor(type, count) | ||
| { | ||
| console.assert(Object.values(WI.StepsTimingFunction.Type).includes(type), type); | ||
| console.assert(count > 0, count); | ||
|
|
||
| this._type = type; | ||
| this._count = count; | ||
| } | ||
|
|
||
| // Static | ||
|
|
||
| static fromString(text) | ||
| { | ||
| if (!text?.length) | ||
| return null; | ||
|
|
||
| let trimmedText = text.toLowerCase().replace(/\s/g, ""); | ||
| if (!trimmedText.length) | ||
| return null; | ||
|
|
||
| let keywordValue = WI.StepsTimingFunction.keywordValues[trimmedText]; | ||
| if (keywordValue) | ||
| return new WI.StepsTimingFunction(...keywordValue); | ||
|
|
||
| let matches = trimmedText.match(/^steps\((\d+)(?:,([a-z-]+))?\)$/); | ||
| if (!matches) | ||
| return null; | ||
|
|
||
| let type = matches[2] || WI.StepsTimingFunction.Type.JumpEnd; | ||
| if (Object.values(WI.StepsTimingFunction).includes(type)) | ||
| return null; | ||
|
|
||
| let count = Number(matches[1]); | ||
| if (isNaN(count) || count <= 0) | ||
| return null; | ||
|
|
||
| return new WI.StepsTimingFunction(type, count); | ||
| } | ||
|
|
||
| // Public | ||
|
|
||
| get type() { return this._type; } | ||
| get count() { return this._count; } | ||
|
|
||
| copy() | ||
| { | ||
| return new WI.StepsTimingFunction(this._type, this._count); | ||
| } | ||
|
|
||
| toString() | ||
| { | ||
| if (this._type === WI.StepsTimingFunction.Type.JumpStart && this._count === 1) | ||
| return "step-start"; | ||
|
|
||
| if (this._type === WI.StepsTimingFunction.Type.JumpEnd && this._count === 1) | ||
| return "step-end"; | ||
|
|
||
| return `steps(${this._count}, ${this._type})`; | ||
| } | ||
| }; | ||
|
|
||
| WI.StepsTimingFunction.Type = { | ||
| JumpStart: "jump-start", | ||
| JumpEnd: "jump-end", | ||
| JumpNone: "jump-none", | ||
| JumpBoth: "jump-both", | ||
| Start: "start", | ||
| End: "end", | ||
| }; | ||
|
|
||
| WI.StepsTimingFunction.keywordValues = { | ||
| "step-start": [WI.StepsTimingFunction.Type.JumpStart, 1], | ||
| "step-end": [WI.StepsTimingFunction.Type.JumpEnd, 1], | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters