Skip to content

Commit 00deb60

Browse files
MattiasBuelenssandersn
authored andcommitted
Random fixes for HTML media and EME (#768)
* Fix MediaKeySession message event type * Fix Document readystatechange event type * Fix HTMLMediaElement msneedkey event type * Add missing TextTrackList event types * Improve return type of MediaKeyStatusMap.get(keyId)
1 parent 1f859dd commit 00deb60

File tree

3 files changed

+79
-7
lines changed

3 files changed

+79
-7
lines changed

baselines/dom.generated.d.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4527,7 +4527,7 @@ interface DocumentEventMap extends GlobalEventHandlersEventMap, DocumentAndEleme
45274527
"fullscreenerror": Event;
45284528
"pointerlockchange": Event;
45294529
"pointerlockerror": Event;
4530-
"readystatechange": ProgressEvent<Document>;
4530+
"readystatechange": Event;
45314531
"visibilitychange": Event;
45324532
}
45334533

@@ -4682,7 +4682,7 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad
46824682
* Fires when the state of the object has changed.
46834683
* @param ev The event
46844684
*/
4685-
onreadystatechange: ((this: Document, ev: ProgressEvent<Document>) => any) | null;
4685+
onreadystatechange: ((this: Document, ev: Event) => any) | null;
46864686
onvisibilitychange: ((this: Document, ev: Event) => any) | null;
46874687
/**
46884688
* Returns document's origin.
@@ -7667,7 +7667,7 @@ declare var HTMLMarqueeElement: {
76677667

76687668
interface HTMLMediaElementEventMap extends HTMLElementEventMap {
76697669
"encrypted": MediaEncryptedEvent;
7670-
"msneedkey": Event;
7670+
"msneedkey": MSMediaKeyNeededEvent;
76717671
"waitingforkey": Event;
76727672
}
76737673

@@ -7764,7 +7764,7 @@ interface HTMLMediaElement extends HTMLElement {
77647764
readonly networkState: number;
77657765
onencrypted: ((this: HTMLMediaElement, ev: MediaEncryptedEvent) => any) | null;
77667766
/** @deprecated */
7767-
onmsneedkey: ((this: HTMLMediaElement, ev: Event) => any) | null;
7767+
onmsneedkey: ((this: HTMLMediaElement, ev: MSMediaKeyNeededEvent) => any) | null;
77687768
onwaitingforkey: ((this: HTMLMediaElement, ev: Event) => any) | null;
77697769
/**
77707770
* Gets a flag that specifies whether playback is paused.
@@ -10331,7 +10331,7 @@ declare var MediaKeyMessageEvent: {
1033110331

1033210332
interface MediaKeySessionEventMap {
1033310333
"keystatuseschange": Event;
10334-
"message": MessageEvent;
10334+
"message": MediaKeyMessageEvent;
1033510335
}
1033610336

1033710337
/** This EncryptedMediaExtensions API interface represents a context for message exchange with a content decryption module (CDM). */
@@ -10340,7 +10340,7 @@ interface MediaKeySession extends EventTarget {
1034010340
readonly expiration: number;
1034110341
readonly keyStatuses: MediaKeyStatusMap;
1034210342
onkeystatuseschange: ((this: MediaKeySession, ev: Event) => any) | null;
10343-
onmessage: ((this: MediaKeySession, ev: MessageEvent) => any) | null;
10343+
onmessage: ((this: MediaKeySession, ev: MediaKeyMessageEvent) => any) | null;
1034410344
readonly sessionId: string;
1034510345
close(): Promise<void>;
1034610346
generateRequest(initDataType: string, initData: BufferSource): Promise<void>;
@@ -10361,7 +10361,7 @@ declare var MediaKeySession: {
1036110361
/** This EncryptedMediaExtensions API interface is a read-only map of media key statuses by key IDs. */
1036210362
interface MediaKeyStatusMap {
1036310363
readonly size: number;
10364-
get(keyId: BufferSource): any;
10364+
get(keyId: BufferSource): MediaKeyStatus | undefined;
1036510365
has(keyId: BufferSource): boolean;
1036610366
forEach(callbackfn: (value: MediaKeyStatus, key: BufferSource, parent: MediaKeyStatusMap) => void, thisArg?: any): void;
1036710367
}
@@ -15888,11 +15888,15 @@ declare var TextTrackCueList: {
1588815888

1588915889
interface TextTrackListEventMap {
1589015890
"addtrack": TrackEvent;
15891+
"change": Event;
15892+
"removetrack": TrackEvent;
1589115893
}
1589215894

1589315895
interface TextTrackList extends EventTarget {
1589415896
readonly length: number;
1589515897
onaddtrack: ((this: TextTrackList, ev: TrackEvent) => any) | null;
15898+
onchange: ((this: TextTrackList, ev: Event) => any) | null;
15899+
onremovetrack: ((this: TextTrackList, ev: TrackEvent) => any) | null;
1589615900
item(index: number): TextTrack;
1589715901
addEventListener<K extends keyof TextTrackListEventMap>(type: K, listener: (this: TextTrackList, ev: TextTrackListEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
1589815902
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;

inputfiles/addedTypes.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,6 +2178,36 @@
21782178
}
21792179
}
21802180
}
2181+
},
2182+
"TextTrackList": {
2183+
"properties": {
2184+
"property": {
2185+
"onchange": {
2186+
"name": "onchange",
2187+
"type": "EventHandler",
2188+
"event-handler": "change",
2189+
"nullable": 1
2190+
},
2191+
"onremovetrack": {
2192+
"name": "onremovetrack",
2193+
"type": "EventHandler",
2194+
"event-handler": "removetrack",
2195+
"nullable": 1
2196+
}
2197+
}
2198+
},
2199+
"events": {
2200+
"event": [
2201+
{
2202+
"name": "change",
2203+
"type": "Event"
2204+
},
2205+
{
2206+
"name": "removetrack",
2207+
"type": "TrackEvent"
2208+
}
2209+
]
2210+
}
21812211
}
21822212
}
21832213
},

inputfiles/overridingTypes.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,14 @@
642642
"nullable": false
643643
}
644644
}
645+
},
646+
"events": {
647+
"event": [
648+
{
649+
"name": "readystatechange",
650+
"type": "Event"
651+
}
652+
]
645653
}
646654
},
647655
"Node": {
@@ -1252,6 +1260,14 @@
12521260
]
12531261
}
12541262
}
1263+
},
1264+
"events": {
1265+
"event": [
1266+
{
1267+
"name": "msneedkey",
1268+
"type": "MSMediaKeyNeededEvent"
1269+
}
1270+
]
12551271
}
12561272
},
12571273
"DataTransferItemList": {
@@ -2761,6 +2777,28 @@
27612777
}
27622778
}
27632779
}
2780+
},
2781+
"MediaKeySession": {
2782+
"events": {
2783+
"event": [
2784+
{
2785+
"name": "message",
2786+
"type": "MediaKeyMessageEvent"
2787+
}
2788+
]
2789+
}
2790+
},
2791+
"MediaKeyStatusMap": {
2792+
"methods": {
2793+
"method": {
2794+
"get": {
2795+
"name": "get",
2796+
"override-signatures": [
2797+
"get(keyId: BufferSource): MediaKeyStatus | undefined"
2798+
]
2799+
}
2800+
}
2801+
}
27642802
}
27652803
}
27662804
},

0 commit comments

Comments
 (0)