Skip to content

Commit 93ff618

Browse files
committed
remove ImageBitmap typedefs
1 parent 095ceb4 commit 93ff618

File tree

3 files changed

+24
-80
lines changed

3 files changed

+24
-80
lines changed

baselines/dom.generated.d.ts

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13261,8 +13261,8 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
1326113261
webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
1326213262
webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
1326313263
webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
13264-
createImageBitmap(image: ImageBitmapSource, options?: ImageBitmapOptions): Promise<ImageBitmap>;
13265-
createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
13264+
createImageBitmap(image: HTMLImageElement | SVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise<ImageBitmap>;
13265+
createImageBitmap(image: HTMLImageElement | SVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
1326613266
scroll(options?: ScrollToOptions): void;
1326713267
scrollTo(options?: ScrollToOptions): void;
1326813268
scrollBy(options?: ScrollToOptions): void;
@@ -13839,12 +13839,12 @@ interface Canvas2DContextAttributes {
1383913839
}
1384013840

1384113841
interface ImageBitmapOptions {
13842-
imageOrientation?: ImageOrientation;
13843-
premultiplyAlpha?: PremultiplyAlpha;
13844-
colorSpaceConversion?: ColorSpaceConversion;
13842+
imageOrientation?: "none" | "flipY";
13843+
premultiplyAlpha?: "none" | "premultiply" | "default";
13844+
colorSpaceConversion?: "none" | "default";
1384513845
resizeWidth?: number;
1384613846
resizeHeight?: number;
13847-
resizeQuality?: ResizeQuality;
13847+
resizeQuality?: "pixelated" | "low" | "medium" | "high";
1384813848
}
1384913849

1385013850
interface ImageBitmap {
@@ -14858,8 +14858,8 @@ declare function webkitCancelAnimationFrame(handle: number): void;
1485814858
declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
1485914859
declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
1486014860
declare function webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
14861-
declare function createImageBitmap(image: ImageBitmapSource, options?: ImageBitmapOptions): Promise<ImageBitmap>;
14862-
declare function createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
14861+
declare function createImageBitmap(image: HTMLImageElement | SVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise<ImageBitmap>;
14862+
declare function createImageBitmap(image: HTMLImageElement | SVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
1486314863
declare function scroll(options?: ScrollToOptions): void;
1486414864
declare function scrollTo(options?: ScrollToOptions): void;
1486514865
declare function scrollBy(options?: ScrollToOptions): void;
@@ -14929,13 +14929,6 @@ type RTCTransport = RTCDtlsTransport | RTCSrtpSdesTransport;
1492914929
type RequestInfo = Request | string;
1493014930
type USVString = string;
1493114931
type payloadtype = number;
14932-
type HTMLOrSVGImageElement = HTMLImageElement | SVGImageElement;
14933-
type CanvasImageSource = HTMLOrSVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap;
14934-
type ImageBitmapSource = CanvasImageSource | Blob | ImageData;
14935-
type ImageOrientation = "none" | "flipY";
14936-
type PremultiplyAlpha = "none" | "premultiply" | "default";
14937-
type ColorSpaceConversion = "none" | "default";
14938-
type ResizeQuality = "pixelated" | "low" | "medium" | "high";
1493914932
type ScrollBehavior = "auto" | "instant" | "smooth";
1494014933
type ScrollLogicalPosition = "start" | "center" | "end" | "nearest";
1494114934
type IDBValidKey = number | string | Date | IDBArrayKey;

baselines/webworker.generated.d.ts

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,8 +1407,8 @@ interface WorkerGlobalScope extends EventTarget, WorkerUtils, WindowConsole, Glo
14071407
readonly performance: Performance;
14081408
readonly self: WorkerGlobalScope;
14091409
msWriteProfilerMark(profilerMarkName: string): void;
1410-
createImageBitmap(image: ImageBitmapSource, options?: ImageBitmapOptions): Promise<ImageBitmap>;
1411-
createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
1410+
createImageBitmap(image: ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise<ImageBitmap>;
1411+
createImageBitmap(image: ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
14121412
addEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
14131413
addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
14141414
}
@@ -1470,12 +1470,12 @@ interface ErrorEventInit {
14701470
}
14711471

14721472
interface ImageBitmapOptions {
1473-
imageOrientation?: ImageOrientation;
1474-
premultiplyAlpha?: PremultiplyAlpha;
1475-
colorSpaceConversion?: ColorSpaceConversion;
1473+
imageOrientation?: "none" | "flipY";
1474+
premultiplyAlpha?: "none" | "premultiply" | "default";
1475+
colorSpaceConversion?: "none" | "default";
14761476
resizeWidth?: number;
14771477
resizeHeight?: number;
1478-
resizeQuality?: ResizeQuality;
1478+
resizeQuality?: "pixelated" | "low" | "medium" | "high";
14791479
}
14801480

14811481
interface ImageBitmap {
@@ -1714,8 +1714,8 @@ declare var onerror: (this: DedicatedWorkerGlobalScope, ev: ErrorEvent) => any;
17141714
declare var performance: Performance;
17151715
declare var self: WorkerGlobalScope;
17161716
declare function msWriteProfilerMark(profilerMarkName: string): void;
1717-
declare function createImageBitmap(image: ImageBitmapSource, options?: ImageBitmapOptions): Promise<ImageBitmap>;
1718-
declare function createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
1717+
declare function createImageBitmap(image: ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise<ImageBitmap>;
1718+
declare function createImageBitmap(image: ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
17191719
declare function dispatchEvent(evt: Event): boolean;
17201720
declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
17211721
declare var indexedDB: IDBFactory;
@@ -1744,12 +1744,5 @@ type BodyInit = any;
17441744
type IDBKeyPath = string;
17451745
type RequestInfo = Request | string;
17461746
type USVString = string;
1747-
type HTMLOrSVGImageElement = HTMLImageElement | SVGImageElement;
1748-
type CanvasImageSource = HTMLOrSVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap;
1749-
type ImageBitmapSource = CanvasImageSource | Blob | ImageData;
1750-
type ImageOrientation = "none" | "flipY";
1751-
type PremultiplyAlpha = "none" | "premultiply" | "default";
1752-
type ColorSpaceConversion = "none" | "default";
1753-
type ResizeQuality = "pixelated" | "low" | "medium" | "high";
17541747
type IDBValidKey = number | string | Date | IDBArrayKey;
17551748
type BufferSource = ArrayBuffer | ArrayBufferView;

inputfiles/addedTypes.json

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -88,64 +88,22 @@
8888
}
8989
]
9090
},
91-
{
92-
"kind": "typedef",
93-
"flavor": "Worker",
94-
"name": "HTMLOrSVGImageElement",
95-
"type": "HTMLImageElement | SVGImageElement"
96-
},
97-
{
98-
"kind": "typedef",
99-
"flavor": "Worker",
100-
"name": "CanvasImageSource",
101-
"type": "HTMLOrSVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap"
102-
},
103-
{
104-
"kind": "typedef",
105-
"flavor": "Worker",
106-
"name": "ImageBitmapSource",
107-
"type": "CanvasImageSource | Blob | ImageData"
108-
},
109-
{
110-
"kind": "typedef",
111-
"flavor": "Worker",
112-
"name": "ImageOrientation",
113-
"type": "\"none\" | \"flipY\""
114-
},
115-
{
116-
"kind": "typedef",
117-
"flavor": "Worker",
118-
"name": "PremultiplyAlpha",
119-
"type": "\"none\" | \"premultiply\" | \"default\""
120-
},
121-
{
122-
"kind": "typedef",
123-
"flavor": "Worker",
124-
"name": "ColorSpaceConversion",
125-
"type": "\"none\" | \"default\""
126-
},
127-
{
128-
"kind": "typedef",
129-
"flavor": "Worker",
130-
"name": "ResizeQuality",
131-
"type": "\"pixelated\" | \"low\" | \"medium\" | \"high\""
132-
},
13391
{
13492
"kind": "interface",
13593
"flavor": "Worker",
13694
"name": "ImageBitmapOptions",
13795
"properties": [
13896
{
13997
"name": "imageOrientation?",
140-
"type": "ImageOrientation"
98+
"type": "\"none\" | \"flipY\""
14199
},
142100
{
143101
"name": "premultiplyAlpha?",
144-
"type": "PremultiplyAlpha"
102+
"type": "\"none\" | \"premultiply\" | \"default\""
145103
},
146104
{
147105
"name": "colorSpaceConversion?",
148-
"type": "ColorSpaceConversion"
106+
"type": "\"none\" | \"default\""
149107
},
150108
{
151109
"name": "resizeWidth?",
@@ -157,7 +115,7 @@
157115
},
158116
{
159117
"name": "resizeQuality?",
160-
"type": "ResizeQuality"
118+
"type": "\"pixelated\" | \"low\" | \"medium\" | \"high\""
161119
}
162120
]
163121
},
@@ -189,17 +147,17 @@
189147
"interface": "Window",
190148
"name": "createImageBitmap",
191149
"signatures": [
192-
"createImageBitmap(image: ImageBitmapSource, options?: ImageBitmapOptions): Promise<ImageBitmap>",
193-
"createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>"
150+
"createImageBitmap(image: HTMLImageElement | SVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise<ImageBitmap>",
151+
"createImageBitmap(image: HTMLImageElement | SVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>"
194152
]
195153
},
196154
{
197155
"kind": "method",
198156
"interface": "WorkerGlobalScope",
199157
"name": "createImageBitmap",
200158
"signatures": [
201-
"createImageBitmap(image: ImageBitmapSource, options?: ImageBitmapOptions): Promise<ImageBitmap>",
202-
"createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>"
159+
"createImageBitmap(image: ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise<ImageBitmap>",
160+
"createImageBitmap(image: ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>"
203161
]
204162
},
205163
{

0 commit comments

Comments
 (0)