Skip to content

Commit db22129

Browse files
saschanazsaschanaz
authored
Merge branch 'master' into refactor2
2 parents e7a1f80 + 6ec9795 commit db22129

File tree

8 files changed

+109
-145
lines changed

8 files changed

+109
-145
lines changed

‎baselines/dom.generated.d.ts‎

Lines changed: 13 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -5370,10 +5370,6 @@ interface Geolocation {
53705370
watchPosition(successCallback: PositionCallback, errorCallback?: PositionErrorCallback, options?: PositionOptions): number;
53715371
}
53725372

5373-
interface GetSVGDocument {
5374-
getSVGDocument(): Document;
5375-
}
5376-
53775373
interface GlobalEventHandlersEventMap {
53785374
"abort": UIEvent;
53795375
"animationcancel": AnimationEvent;
@@ -6312,56 +6308,28 @@ declare var HTMLElement: {
63126308
};
63136309

63146310
/** The HTMLEmbedElement interface, which provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <embed> elements. */
6315-
interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
6311+
interface HTMLEmbedElement extends HTMLElement {
63166312
/** @deprecated */
63176313
align: string;
63186314
/**
63196315
* Sets or retrieves the height of the object.
63206316
*/
63216317
height: string;
6322-
hidden: any;
6323-
/**
6324-
* Gets or sets whether the DLNA PlayTo device is available.
6325-
*/
6326-
msPlayToDisabled: boolean;
6327-
/**
6328-
* Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server.
6329-
*/
6330-
msPlayToPreferredSourceUri: string;
6331-
/**
6332-
* Gets or sets the primary DLNA PlayTo device.
6333-
*/
6334-
msPlayToPrimary: boolean;
6335-
/**
6336-
* Gets the source associated with the media element for use by the PlayToManager.
6337-
*/
6338-
readonly msPlayToSource: any;
63396318
/**
63406319
* Sets or retrieves the name of the object.
63416320
*/
63426321
/** @deprecated */
63436322
name: string;
6344-
/**
6345-
* Retrieves the palette used for the embedded document.
6346-
*/
6347-
readonly palette: string;
6348-
/**
6349-
* Retrieves the URL of the plug-in used to view an embedded document.
6350-
*/
6351-
readonly pluginspage: string;
6352-
readonly readyState: string;
63536323
/**
63546324
* Sets or retrieves a URL to be loaded by the object.
63556325
*/
63566326
src: string;
6357-
/**
6358-
* Sets or retrieves the height and width units of the embed object.
6359-
*/
6360-
units: string;
6327+
type: string;
63616328
/**
63626329
* Sets or retrieves the width of the object.
63636330
*/
63646331
width: string;
6332+
getSVGDocument(): Document | null;
63656333
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLEmbedElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
63666334
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
63676335
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLEmbedElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6707,12 +6675,13 @@ interface HTMLHyperlinkElementUtils {
67076675
}
67086676

67096677
/** The HTMLIFrameElement interface provides special properties and methods (beyond those of the HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of inline frame elements. */
6710-
interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
6678+
interface HTMLIFrameElement extends HTMLElement {
67116679
/**
67126680
* Sets or retrieves how the object is aligned with adjacent text.
67136681
*/
67146682
/** @deprecated */
67156683
align: string;
6684+
allow: string;
67166685
allowFullscreen: boolean;
67176686
allowPaymentRequest: boolean;
67186687
/**
@@ -6722,7 +6691,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
67226691
/**
67236692
* Retrieves the object of the specified.
67246693
*/
6725-
readonly contentWindow: Window | null;
6694+
readonly contentWindow: WindowProxy | null;
67266695
/**
67276696
* Sets or retrieves whether to display a border for the frame.
67286697
*/
@@ -6751,7 +6720,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
67516720
* Sets or retrieves the frame name.
67526721
*/
67536722
name: string;
6754-
readonly referrerPolicy: ReferrerPolicy;
6723+
referrerPolicy: ReferrerPolicy;
67556724
readonly sandbox: DOMTokenList;
67566725
/**
67576726
* Sets or retrieves whether the frame can be scrolled.
@@ -6770,6 +6739,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
67706739
* Sets or retrieves the width of the object.
67716740
*/
67726741
width: string;
6742+
getSVGDocument(): Document | null;
67736743
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLIFrameElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
67746744
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
67756745
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLIFrameElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7581,11 +7551,7 @@ declare var HTMLOListElement: {
75817551
};
75827552

75837553
/** The HTMLObjectElement interface provides special properties and methods (beyond those on the HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of <object> element, representing external resources. */
7584-
interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
7585-
/**
7586-
* Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
7587-
*/
7588-
readonly BaseHref: string;
7554+
interface HTMLObjectElement extends HTMLElement {
75897555
/** @deprecated */
75907556
align: string;
75917557
/**
@@ -7614,6 +7580,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
76147580
* Retrieves the document object of the page or frame.
76157581
*/
76167582
readonly contentDocument: Document | null;
7583+
readonly contentWindow: WindowProxy | null;
76177584
/**
76187585
* Sets or retrieves the URL that references the data of the object.
76197586
*/
@@ -7630,27 +7597,10 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
76307597
height: string;
76317598
/** @deprecated */
76327599
hspace: number;
7633-
/**
7634-
* Gets or sets whether the DLNA PlayTo device is available.
7635-
*/
7636-
msPlayToDisabled: boolean;
7637-
/**
7638-
* Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server.
7639-
*/
7640-
msPlayToPreferredSourceUri: string;
7641-
/**
7642-
* Gets or sets the primary DLNA PlayTo device.
7643-
*/
7644-
msPlayToPrimary: boolean;
7645-
/**
7646-
* Gets the source associated with the media element for use by the PlayToManager.
7647-
*/
7648-
readonly msPlayToSource: any;
76497600
/**
76507601
* Sets or retrieves the name of the object.
76517602
*/
76527603
name: string;
7653-
readonly readyState: number;
76547604
/**
76557605
* Sets or retrieves a message to be displayed while an object is loading.
76567606
*/
@@ -7660,7 +7610,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
76607610
* Sets or retrieves the MIME type of the object.
76617611
*/
76627612
type: string;
7663-
typemustmatch: boolean;
7613+
typeMustMatch: boolean;
76647614
/**
76657615
* Sets or retrieves the URL, often with a bookmark extension (#name), to use as a client-side image map.
76667616
*/
@@ -7687,6 +7637,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
76877637
* Returns whether a form will validate when it is submitted, without having to submit it.
76887638
*/
76897639
checkValidity(): boolean;
7640+
getSVGDocument(): Document | null;
76907641
reportValidity(): boolean;
76917642
/**
76927643
* Sets a custom error message that is displayed when a form is submitted.
@@ -11148,7 +11099,7 @@ declare var PaymentRequest: {
1114811099

1114911100
/** The PaymentRequestUpdateEvent interface of the the Payment Request API enables a web page to update the details of a PaymentRequest in response to a user action. */
1115011101
interface PaymentRequestUpdateEvent extends Event {
11151-
updateWith(detailsPromise: Promise<PaymentDetailsUpdate>): void;
11102+
updateWith(detailsPromise: PaymentDetailsUpdate | Promise<PaymentDetailsUpdate>): void;
1115211103
}
1115311104

1115411105
declare var PaymentRequestUpdateEvent: {

‎baselines/webworker.generated.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,7 @@ declare var EventTarget: {
12851285

12861286
/** The ExtendableEvent interface extends the lifetime of the install and activate events dispatched on the global scope as part of the service worker lifecycle. This ensures that any functional events (like FetchEvent) are not dispatched until it upgrades database schemas and deletes the outdated cache entries. */
12871287
interface ExtendableEvent extends Event {
1288-
waitUntil(f: Promise<any>): void;
1288+
waitUntil(f: any): void;
12891289
}
12901290

12911291
declare var ExtendableEvent: {
@@ -1314,7 +1314,7 @@ interface FetchEvent extends ExtendableEvent {
13141314
readonly request: Request;
13151315
readonly resultingClientId: string;
13161316
readonly targetClientId: string;
1317-
respondWith(r: Promise<Response>): void;
1317+
respondWith(r: Response | Promise<Response>): void;
13181318
}
13191319

13201320
declare var FetchEvent: {

‎inputfiles/addedTypes.json‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -773,17 +773,16 @@
773773
"name": "HTMLIFrameElement",
774774
"properties": {
775775
"property": {
776-
"srcdoc": {
777-
"name": "srcdoc",
778-
"override-type": "string"
779-
},
780776
"referrerPolicy": {
781-
"name": "referrerPolicy",
782-
"read-only": 1,
783-
"override-type": "ReferrerPolicy"
777+
"type": "ReferrerPolicy"
784778
}
785779
}
786-
}
780+
},
781+
"element": [
782+
{
783+
"name": "iframe"
784+
}
785+
]
787786
},
788787
"HTMLTextAreaElement": {
789788
"name": "HTMLTextAreaElement",
@@ -1201,27 +1200,6 @@
12011200
}
12021201
}
12031202
},
1204-
"HTMLObjectElement": {
1205-
"name": "HTMLObjectElement",
1206-
"properties": {
1207-
"property": {
1208-
"typemustmatch": {
1209-
"name": "typemustmatch",
1210-
"override-type": "boolean"
1211-
}
1212-
}
1213-
},
1214-
"methods": {
1215-
"method": {
1216-
"reportValidity": {
1217-
"name": "reportValidity",
1218-
"override-signatures": [
1219-
"reportValidity(): boolean"
1220-
]
1221-
}
1222-
}
1223-
}
1224-
},
12251203
"EventSource": {
12261204
"events": {
12271205
"event": [
@@ -1416,6 +1394,13 @@
14161394
"ElementCSSInlineStyle"
14171395
]
14181396
},
1397+
"HTMLEmbedElement": {
1398+
"element": [
1399+
{
1400+
"name": "embed"
1401+
}
1402+
]
1403+
},
14191404
"HTMLFormElement": {
14201405
"element": [
14211406
{
@@ -1518,6 +1503,13 @@
15181503
}
15191504
]
15201505
},
1506+
"HTMLObjectElement": {
1507+
"element": [
1508+
{
1509+
"name": "object"
1510+
}
1511+
]
1512+
},
15211513
"HTMLOListElement": {
15221514
"element": [
15231515
{
@@ -1532,6 +1524,13 @@
15321524
}
15331525
]
15341526
},
1527+
"HTMLParamElement": {
1528+
"element": [
1529+
{
1530+
"name": "param"
1531+
}
1532+
]
1533+
},
15351534
"HTMLPictureElement": {
15361535
"element": [
15371536
{

‎inputfiles/comments.json‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,9 +1744,6 @@
17441744
"type": {
17451745
"comment": "/**\r\n * Sets or retrieves the MIME type of the object.\r\n */"
17461746
},
1747-
"BaseHref": {
1748-
"comment": "/**\r\n * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.\r\n */"
1749-
},
17501747
"validationMessage": {
17511748
"comment": "/**\r\n * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as \"this is a required field\". The result is that the user sees validation messages without actually submitting.\r\n */"
17521749
},
@@ -1755,18 +1752,6 @@
17551752
},
17561753
"willValidate": {
17571754
"comment": "/**\r\n * Returns whether an element will successfully validate based on forms validation rules and constraints.\r\n */"
1758-
},
1759-
"msPlayToPreferredSourceUri": {
1760-
"comment": "/**\r\n * Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server.\r\n */"
1761-
},
1762-
"msPlayToPrimary": {
1763-
"comment": "/**\r\n * Gets or sets the primary DLNA PlayTo device.\r\n */"
1764-
},
1765-
"msPlayToDisabled": {
1766-
"comment": "/**\r\n * Gets or sets whether the DLNA PlayTo device is available.\r\n */"
1767-
},
1768-
"msPlayToSource": {
1769-
"comment": "/**\r\n * Gets the source associated with the media element for use by the PlayToManager.\r\n */"
17701755
}
17711756
}
17721757
},
@@ -1787,35 +1772,14 @@
17871772
"width": {
17881773
"comment": "/**\r\n * Sets or retrieves the width of the object.\r\n */"
17891774
},
1790-
"palette": {
1791-
"comment": "/**\r\n * Retrieves the palette used for the embedded document.\r\n */"
1792-
},
17931775
"src": {
17941776
"comment": "/**\r\n * Sets or retrieves a URL to be loaded by the object.\r\n */"
17951777
},
17961778
"name": {
17971779
"comment": "/**\r\n * Sets or retrieves the name of the object.\r\n */"
17981780
},
1799-
"pluginspage": {
1800-
"comment": "/**\r\n * Retrieves the URL of the plug-in used to view an embedded document.\r\n */"
1801-
},
18021781
"height": {
18031782
"comment": "/**\r\n * Sets or retrieves the height of the object.\r\n */"
1804-
},
1805-
"units": {
1806-
"comment": "/**\r\n * Sets or retrieves the height and width units of the embed object.\r\n */"
1807-
},
1808-
"msPlayToPreferredSourceUri": {
1809-
"comment": "/**\r\n * Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server.\r\n */"
1810-
},
1811-
"msPlayToPrimary": {
1812-
"comment": "/**\r\n * Gets or sets the primary DLNA PlayTo device.\r\n */"
1813-
},
1814-
"msPlayToDisabled": {
1815-
"comment": "/**\r\n * Gets or sets whether the DLNA PlayTo device is available.\r\n */"
1816-
},
1817-
"msPlayToSource": {
1818-
"comment": "/**\r\n * Gets the source associated with the media element for use by the PlayToManager.\r\n */"
18191783
}
18201784
}
18211785
}

0 commit comments

Comments
 (0)