From 220f9e11aa40b1f8a755fdf8be09da2edd33c7dc Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Fri, 19 Jul 2024 12:45:29 +0100 Subject: [PATCH] Color: extract a common color Space type Bug:none Change-Id: Ia56f6a9b86b10be617e895a8bbb660c4ec0e2db0 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5725535 Auto-Submit: Paul Irish Reviewed-by: Jack Franklin Commit-Queue: Jack Franklin Commit-Queue: Paul Irish --- front_end/core/common/Color.ts | 58 +++++++--------------------------- 1 file changed, 12 insertions(+), 46 deletions(-) diff --git a/front_end/core/common/Color.ts b/front_end/core/common/Color.ts index f65d0c50f1..8d4ee3b3b4 100644 --- a/front_end/core/common/Color.ts +++ b/front_end/core/common/Color.ts @@ -2385,49 +2385,19 @@ export const IsolationModeHighlight = { Mask: Legacy.fromRGBA([248, 249, 249, 1]), }; +type Space = number|{ + min: number, + max: number, + count: (number|undefined), +}; + export class Generator { - readonly #hueSpace: number|{ - min: number, - max: number, - count: (number|undefined), - }; - readonly #satSpace: number|{ - min: number, - max: number, - count: (number|undefined), - }; - readonly #lightnessSpace: number|{ - min: number, - max: number, - count: (number|undefined), - }; - readonly #alphaSpace: number|{ - min: number, - max: number, - count: (number|undefined), - }; + readonly #hueSpace: Space; + readonly #satSpace: Space; + readonly #lightnessSpace: Space; + readonly #alphaSpace: Space; readonly #colors: Map; - constructor( - hueSpace?: number|{ - min: number, - max: number, - count: (number|undefined), - }, - satSpace?: number|{ - min: number, - max: number, - count: (number|undefined), - }, - lightnessSpace?: number|{ - min: number, - max: number, - count: (number|undefined), - }, - alphaSpace?: number|{ - min: number, - max: number, - count: (number|undefined), - }) { + constructor(hueSpace?: Space, satSpace?: Space, lightnessSpace?: Space, alphaSpace?: Space) { this.#hueSpace = hueSpace || {min: 0, max: 360, count: undefined}; this.#satSpace = satSpace || 67; this.#lightnessSpace = lightnessSpace || 80; @@ -2461,11 +2431,7 @@ export class Generator { return `${start})`; } - private indexToValueInSpace(index: number, space: number|{ - min: number, - max: number, - count: (number|undefined), - }): number { + private indexToValueInSpace(index: number, space: Space): number { if (typeof space === 'number') { return space; }