From 43e980c0ba65f021f1f12ca90f2134635d832787 Mon Sep 17 00:00:00 2001 From: IllusionMH Date: Wed, 18 Mar 2020 00:53:32 +0200 Subject: [PATCH 1/2] Fix duplicated interfaces --- inputfiles/addedTypes.json | 136 +++++++++++++++---------------------- 1 file changed, 54 insertions(+), 82 deletions(-) diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 564e7dd92..1d754727a 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -416,6 +416,16 @@ "type": "MediaEncryptedEvent" } ] + }, + "methods": { + "method": { + "cloneNode": { + "name": "cloneNode", + "override-signatures": [ + "cloneNode(deep?: boolean): HTMLMediaElement" + ] + } + } } }, "CSSStyleDeclaration": { @@ -1277,7 +1287,17 @@ { "name": "audio" } - ] + ], + "methods": { + "method": { + "cloneNode": { + "name": "cloneNode", + "override-signatures": [ + "cloneNode(deep?: boolean): HTMLAudioElement" + ] + } + } + } }, "HTMLBaseElement": { "element": [ @@ -1301,7 +1321,17 @@ { "name": "body" } - ] + ], + "methods": { + "method": { + "cloneNode": { + "name": "cloneNode", + "override-signatures": [ + "cloneNode(deep?: boolean): HTMLBodyElement" + ] + } + } + } }, "HTMLBRElement": { "element": [ @@ -1607,7 +1637,17 @@ { "name": "h6" } - ] + ], + "methods": { + "method": { + "cloneNode": { + "name": "cloneNode", + "override-signatures": [ + "cloneNode(deep?: boolean): HTMLHeadingElement" + ] + } + } + } }, "HTMLHRElement": { "element": [ @@ -2232,7 +2272,17 @@ { "name": "track" } - ] + ], + "methods": { + "method": { + "cloneNode": { + "name": "cloneNode", + "override-signatures": [ + "cloneNode(deep?: boolean): HTMLTrackElement" + ] + } + } + } }, "HTMLUListElement": { "element": [ @@ -3401,19 +3451,6 @@ } } }, - "HTMLAudioElement": { - "name": "HTMLAudioElement", - "methods": { - "method": { - "cloneNode": { - "name": "cloneNode", - "override-signatures": [ - "cloneNode(deep?: boolean): HTMLAudioElement" - ] - } - } - } - }, "HTMLBaseFontElement": { "name": "HTMLBaseFontElement", "methods": { @@ -3427,19 +3464,6 @@ } } }, - "HTMLBodyElement": { - "name": "HTMLBodyElement", - "methods": { - "method": { - "cloneNode": { - "name": "cloneNode", - "override-signatures": [ - "cloneNode(deep?: boolean): HTMLBodyElement" - ] - } - } - } - }, "HTMLButtonElement": { "name": "HTMLButtonElement", "methods": { @@ -3544,19 +3568,6 @@ } } }, - "HTMLHeadingElement": { - "name": "HTMLHeadingElement", - "methods": { - "method": { - "cloneNode": { - "name": "cloneNode", - "override-signatures": [ - "cloneNode(deep?: boolean): HTMLHeadingElement" - ] - } - } - } - }, "HTMLLegendElement": { "name": "HTMLLegendElement", "methods": { @@ -3583,19 +3594,6 @@ } } }, - "HTMLMediaElement": { - "name": "HTMLMediaElement", - "methods": { - "method": { - "cloneNode": { - "name": "cloneNode", - "override-signatures": [ - "cloneNode(deep?: boolean): HTMLMediaElement" - ] - } - } - } - }, "HTMLMeterElement": { "name": "HTMLMeterElement", "methods": { @@ -3674,19 +3672,6 @@ } } }, - "HTMLTrackElement": { - "name": "HTMLTrackElement", - "methods": { - "method": { - "cloneNode": { - "name": "cloneNode", - "override-signatures": [ - "cloneNode(deep?: boolean): HTMLTrackElement" - ] - } - } - } - }, "HTMLUnknownElement": { "name": "HTMLUnknownElement", "methods": { @@ -3700,19 +3685,6 @@ } } }, - "HTMLVideoElement": { - "name": "HTMLVideoElement", - "methods": { - "method": { - "cloneNode": { - "name": "cloneNode", - "override-signatures": [ - "cloneNode(deep?: boolean): HTMLVideoElement" - ] - } - } - } - }, "ProcessingInstruction": { "name": "ProcessingInstruction", "methods": { From 76e78d98263596bc44972e5eee6c166e9a3195d4 Mon Sep 17 00:00:00 2001 From: IllusionMH Date: Wed, 18 Mar 2020 00:57:12 +0200 Subject: [PATCH 2/2] Update baselines after fix --- baselines/dom.generated.d.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index c24a4deee..66adfb6bc 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -7552,7 +7552,7 @@ declare var HTMLMarqueeElement: { }; interface HTMLMediaElementEventMap extends HTMLElementEventMap { - "encrypted": Event; + "encrypted": MediaEncryptedEvent; "waitingforkey": Event; } @@ -7609,7 +7609,7 @@ interface HTMLMediaElement extends HTMLElement { * Gets the current network activity for the element. */ readonly networkState: number; - onencrypted: ((this: HTMLMediaElement, ev: Event) => any) | null; + onencrypted: ((this: HTMLMediaElement, ev: MediaEncryptedEvent) => any) | null; onwaitingforkey: ((this: HTMLMediaElement, ev: Event) => any) | null; /** * Gets a flag that specifies whether playback is paused. @@ -19360,12 +19360,14 @@ interface HTMLElementTagNameMap { "area": HTMLAreaElement; "article": HTMLElement; "aside": HTMLElement; + "audio": HTMLAudioElement; "b": HTMLElement; "base": HTMLBaseElement; "basefont": HTMLBaseFontElement; "bdi": HTMLElement; "bdo": HTMLElement; "blockquote": HTMLQuoteElement; + "body": HTMLBodyElement; "br": HTMLBRElement; "button": HTMLButtonElement; "canvas": HTMLCanvasElement; @@ -19395,6 +19397,12 @@ interface HTMLElementTagNameMap { "form": HTMLFormElement; "frame": HTMLFrameElement; "frameset": HTMLFrameSetElement; + "h1": HTMLHeadingElement; + "h2": HTMLHeadingElement; + "h3": HTMLHeadingElement; + "h4": HTMLHeadingElement; + "h5": HTMLHeadingElement; + "h6": HTMLHeadingElement; "head": HTMLHeadElement; "header": HTMLElement; "hgroup": HTMLElement; @@ -19458,9 +19466,11 @@ interface HTMLElementTagNameMap { "time": HTMLTimeElement; "title": HTMLTitleElement; "tr": HTMLTableRowElement; + "track": HTMLTrackElement; "u": HTMLElement; "ul": HTMLUListElement; "var": HTMLElement; + "video": HTMLVideoElement; "wbr": HTMLElement; }