Skip to content

Commit 9bfdc28

Browse files
committed
Fix issue microsoft#3216
1 parent 379ca11 commit 9bfdc28

File tree

2 files changed

+25
-56
lines changed

2 files changed

+25
-56
lines changed

src/lib/dom.generated.d.ts

Lines changed: 23 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,16 +1092,11 @@ interface CanvasRenderingContext2D {
10921092
clearRect(x: number, y: number, w: number, h: number): void;
10931093
clip(fillRule?: string): void;
10941094
closePath(): void;
1095-
createImageData(imageDataOrSw: number, sh?: number): ImageData;
1096-
createImageData(imageDataOrSw: ImageData, sh?: number): ImageData;
1095+
createImageData(imageDataOrSw: number | ImageData, sh?: number): ImageData;
10971096
createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
1098-
createPattern(image: HTMLImageElement, repetition: string): CanvasPattern;
1099-
createPattern(image: HTMLCanvasElement, repetition: string): CanvasPattern;
1100-
createPattern(image: HTMLVideoElement, repetition: string): CanvasPattern;
1097+
createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern;
11011098
createRadialGradient(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): CanvasGradient;
1102-
drawImage(image: HTMLImageElement, offsetX: number, offsetY: number, width?: number, height?: number, canvasOffsetX?: number, canvasOffsetY?: number, canvasImageWidth?: number, canvasImageHeight?: number): void;
1103-
drawImage(image: HTMLCanvasElement, offsetX: number, offsetY: number, width?: number, height?: number, canvasOffsetX?: number, canvasOffsetY?: number, canvasImageWidth?: number, canvasImageHeight?: number): void;
1104-
drawImage(image: HTMLVideoElement, offsetX: number, offsetY: number, width?: number, height?: number, canvasOffsetX?: number, canvasOffsetY?: number, canvasImageWidth?: number, canvasImageHeight?: number): void;
1099+
drawImage(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, offsetX: number, offsetY: number, width?: number, height?: number, canvasOffsetX?: number, canvasOffsetY?: number, canvasImageWidth?: number, canvasImageHeight?: number): void;
11051100
fill(fillRule?: string): void;
11061101
fillRect(x: number, y: number, w: number, h: number): void;
11071102
fillText(text: string, x: number, y: number, maxWidth?: number): void;
@@ -3370,8 +3365,7 @@ interface HTMLAreasCollection extends HTMLCollection {
33703365
/**
33713366
* Adds an element to the areas, controlRange, or options collection.
33723367
*/
3373-
add(element: HTMLElement, before?: HTMLElement): void;
3374-
add(element: HTMLElement, before?: number): void;
3368+
add(element: HTMLElement, before?: HTMLElement | number): void;
33753369
/**
33763370
* Removes an element from the collection.
33773371
*/
@@ -6119,8 +6113,7 @@ interface HTMLSelectElement extends HTMLElement {
61196113
* @param element Variant of type Number that specifies the index position in the collection where the element is placed. If no value is given, the method places the element at the end of the collection.
61206114
* @param before Variant of type Object that specifies an element to insert before, or null to append the object to the collection.
61216115
*/
6122-
add(element: HTMLElement, before?: HTMLElement): void;
6123-
add(element: HTMLElement, before?: number): void;
6116+
add(element: HTMLElement, before?: HTMLElement | number): void;
61246117
/**
61256118
* Returns whether a form will validate when it is submitted, without having to submit it.
61266119
*/
@@ -10281,8 +10274,7 @@ interface Screen extends EventTarget {
1028110274
systemXDPI: number;
1028210275
systemYDPI: number;
1028310276
width: number;
10284-
msLockOrientation(orientations: string): boolean;
10285-
msLockOrientation(orientations: string[]): boolean;
10277+
msLockOrientation(orientations: string | string[]): boolean;
1028610278
msUnlockOrientation(): void;
1028710279
addEventListener(type: "MSOrientationChange", listener: (ev: Event) => any, useCapture?: boolean): void;
1028810280
addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -10354,8 +10346,7 @@ interface SourceBuffer extends EventTarget {
1035410346
updating: boolean;
1035510347
videoTracks: VideoTrackList;
1035610348
abort(): void;
10357-
appendBuffer(data: ArrayBuffer): void;
10358-
appendBuffer(data: ArrayBufferView): void;
10349+
appendBuffer(data: ArrayBuffer | ArrayBufferView): void;
1035910350
appendStream(stream: MSStream, maxSize?: number): void;
1036010351
remove(start: number, end: number): void;
1036110352
}
@@ -10463,33 +10454,18 @@ declare var StyleSheetPageList: {
1046310454
}
1046410455

1046510456
interface SubtleCrypto {
10466-
decrypt(algorithm: string, key: CryptoKey, data: ArrayBufferView): any;
10467-
decrypt(algorithm: Algorithm, key: CryptoKey, data: ArrayBufferView): any;
10468-
deriveBits(algorithm: string, baseKey: CryptoKey, length: number): any;
10469-
deriveBits(algorithm: Algorithm, baseKey: CryptoKey, length: number): any;
10470-
deriveKey(algorithm: string, baseKey: CryptoKey, derivedKeyType: string, extractable: boolean, keyUsages: string[]): any;
10471-
deriveKey(algorithm: string, baseKey: CryptoKey, derivedKeyType: Algorithm, extractable: boolean, keyUsages: string[]): any;
10472-
deriveKey(algorithm: Algorithm, baseKey: CryptoKey, derivedKeyType: string, extractable: boolean, keyUsages: string[]): any;
10473-
deriveKey(algorithm: Algorithm, baseKey: CryptoKey, derivedKeyType: Algorithm, extractable: boolean, keyUsages: string[]): any;
10474-
digest(algorithm: string, data: ArrayBufferView): any;
10475-
digest(algorithm: Algorithm, data: ArrayBufferView): any;
10476-
encrypt(algorithm: string, key: CryptoKey, data: ArrayBufferView): any;
10477-
encrypt(algorithm: Algorithm, key: CryptoKey, data: ArrayBufferView): any;
10457+
decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
10458+
deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): any;
10459+
deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
10460+
digest(algorithm: string | Algorithm, data: ArrayBufferView): any;
10461+
encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
1047810462
exportKey(format: string, key: CryptoKey): any;
10479-
generateKey(algorithm: string, extractable: boolean, keyUsages: string[]): any;
10480-
generateKey(algorithm: Algorithm, extractable: boolean, keyUsages: string[]): any;
10481-
importKey(format: string, keyData: ArrayBufferView, algorithm: string, extractable: boolean, keyUsages: string[]): any;
10482-
importKey(format: string, keyData: ArrayBufferView, algorithm: Algorithm, extractable: boolean, keyUsages: string[]): any;
10483-
sign(algorithm: string, key: CryptoKey, data: ArrayBufferView): any;
10484-
sign(algorithm: Algorithm, key: CryptoKey, data: ArrayBufferView): any;
10485-
unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string, unwrappedKeyAlgorithm: string, extractable: boolean, keyUsages: string[]): any;
10486-
unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string, unwrappedKeyAlgorithm: Algorithm, extractable: boolean, keyUsages: string[]): any;
10487-
unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: Algorithm, unwrappedKeyAlgorithm: string, extractable: boolean, keyUsages: string[]): any;
10488-
unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: Algorithm, unwrappedKeyAlgorithm: Algorithm, extractable: boolean, keyUsages: string[]): any;
10489-
verify(algorithm: string, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): any;
10490-
verify(algorithm: Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): any;
10491-
wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string): any;
10492-
wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: Algorithm): any;
10463+
generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
10464+
importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
10465+
sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
10466+
unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
10467+
verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): any;
10468+
wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): any;
1049310469
}
1049410470

1049510471
declare var SubtleCrypto: {
@@ -10998,11 +10974,8 @@ interface WebGLRenderingContext {
1099810974
blendEquationSeparate(modeRGB: number, modeAlpha: number): void;
1099910975
blendFunc(sfactor: number, dfactor: number): void;
1100010976
blendFuncSeparate(srcRGB: number, dstRGB: number, srcAlpha: number, dstAlpha: number): void;
11001-
bufferData(target: number, size: number, usage: number): void;
11002-
bufferData(target: number, size: ArrayBufferView, usage: number): void;
11003-
bufferData(target: number, size: any, usage: number): void;
11004-
bufferSubData(target: number, offset: number, data: ArrayBufferView): void;
11005-
bufferSubData(target: number, offset: number, data: any): void;
10977+
bufferData(target: number, size: number | ArrayBufferView | ArrayBuffer, usage: number): void;
10978+
bufferSubData(target: number, offset: number, data: ArrayBufferView | ArrayBuffer): void;
1100610979
checkFramebufferStatus(target: number): number;
1100710980
clear(mask: number): void;
1100810981
clearColor(red: number, green: number, blue: number, alpha: number): void;
@@ -11845,8 +11818,7 @@ interface WebSocket extends EventTarget {
1184511818

1184611819
declare var WebSocket: {
1184711820
prototype: WebSocket;
11848-
new(url: string, protocols?: string): WebSocket;
11849-
new(url: string, protocols?: any): WebSocket;
11821+
new(url: string, protocols?: string | string[]): WebSocket;
1185011822
CLOSED: number;
1185111823
CLOSING: number;
1185211824
CONNECTING: number;
@@ -12650,8 +12622,7 @@ interface EventListenerObject {
1265012622
declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
1265112623

1265212624
interface ErrorEventHandler {
12653-
(event: Event, source?: string, fileno?: number, columnNumber?: number): void;
12654-
(event: string, source?: string, fileno?: number, columnNumber?: number): void;
12625+
(event: Event | string, source?: string, fileno?: number, columnNumber?: number): void;
1265512626
}
1265612627
interface PositionCallback {
1265712628
(position: Position): void;
@@ -12978,4 +12949,4 @@ declare function addEventListener(type: "unload", listener: (ev: Event) => any,
1297812949
declare function addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
1297912950
declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
1298012951
declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
12981-
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
12952+
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;

src/lib/webworker.generated.d.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,7 @@ interface WebSocket extends EventTarget {
571571

572572
declare var WebSocket: {
573573
prototype: WebSocket;
574-
new(url: string, protocols?: string): WebSocket;
575-
new(url: string, protocols?: any): WebSocket;
574+
new(url: string, protocols?: string | string[]): WebSocket;
576575
CLOSED: number;
577576
CLOSING: number;
578577
CONNECTING: number;
@@ -807,8 +806,7 @@ interface EventListenerObject {
807806
declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
808807

809808
interface ErrorEventHandler {
810-
(event: Event, source?: string, fileno?: number, columnNumber?: number): void;
811-
(event: string, source?: string, fileno?: number, columnNumber?: number): void;
809+
(event: Event | string, source?: string, fileno?: number, columnNumber?: number): void;
812810
}
813811
interface PositionCallback {
814812
(position: Position): void;

0 commit comments

Comments
 (0)