Skip to content

Commit c3cc60d

Browse files
saschanazsaschanaz
committed
Merge branch 'master' into text-semantics
2 parents e70e79b + b7801f4 commit c3cc60d

7 files changed

+119
-50
lines changed

‎baselines/dom.generated.d.ts

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6549,8 +6549,6 @@ declare var HTMLHRElement: {
65496549
};
65506550

65516551
interface HTMLHeadElement extends HTMLElement {
6552-
/** @deprecated */
6553-
profile: string;
65546552
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
65556553
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
65566554
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7032,6 +7030,7 @@ declare var HTMLLegendElement: {
70327030
};
70337031

70347032
interface HTMLLinkElement extends HTMLElement, LinkStyle {
7033+
as: string;
70357034
/**
70367035
* Sets or retrieves the character set used to encode the object.
70377036
*/
@@ -7047,12 +7046,12 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
70477046
* Sets or retrieves the language code of the object.
70487047
*/
70497048
hreflang: string;
7050-
import?: Document;
70517049
integrity: string;
70527050
/**
70537051
* Sets or retrieves the media type.
70547052
*/
70557053
media: string;
7054+
referrerPolicy: string;
70567055
/**
70577056
* Sets or retrieves the relationship between the object and the destination of the link.
70587057
*/
@@ -7063,6 +7062,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
70637062
*/
70647063
/** @deprecated */
70657064
rev: string;
7065+
readonly sizes: DOMTokenList;
70667066
/**
70677067
* Sets or retrieves the window or frame at which to target content.
70687068
*/
@@ -7376,11 +7376,6 @@ declare var HTMLMenuElement: {
73767376
};
73777377

73787378
interface HTMLMetaElement extends HTMLElement {
7379-
/**
7380-
* Sets or retrieves the character set used to encode the object.
7381-
*/
7382-
/** @deprecated */
7383-
charset: string;
73847379
/**
73857380
* Gets or sets meta-information to associate with httpEquiv or name.
73867381
*/
@@ -7398,11 +7393,6 @@ interface HTMLMetaElement extends HTMLElement {
73987393
*/
73997394
/** @deprecated */
74007395
scheme: string;
7401-
/**
7402-
* Sets or retrieves the URL property that will be loaded after the specified time has elapsed.
7403-
*/
7404-
/** @deprecated */
7405-
url: string;
74067396
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMetaElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
74077397
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
74087398
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMetaElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8030,8 +8020,6 @@ declare var HTMLSpanElement: {
80308020
};
80318021

80328022
interface HTMLStyleElement extends HTMLElement, LinkStyle {
8033-
/** @deprecated */
8034-
disabled: boolean;
80358023
/**
80368024
* Sets or retrieves the media type.
80378025
*/

‎inputfiles/addedTypes.json

Lines changed: 57 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -718,18 +718,6 @@
718718
}
719719
}
720720
},
721-
"HTMLLinkElement": {
722-
"name": "HTMLLinkElement",
723-
"properties": {
724-
"property": {
725-
"import": {
726-
"name": "import",
727-
"override-type": "Document",
728-
"required": 0
729-
}
730-
}
731-
}
732-
},
733721
"HTMLCanvasElement": {
734722
"name": "HTMLCanvasElement",
735723
"methods": {
@@ -2135,6 +2123,13 @@
21352123
}
21362124
]
21372125
},
2126+
"HTMLBaseElement": {
2127+
"element": [
2128+
{
2129+
"name": "base"
2130+
}
2131+
]
2132+
},
21382133
"HTMLBRElement": {
21392134
"element": [
21402135
{
@@ -2163,13 +2158,42 @@
21632158
}
21642159
]
21652160
},
2161+
"HTMLHeadElement": {
2162+
"element": [
2163+
{
2164+
"name": "head"
2165+
}
2166+
]
2167+
},
21662168
"HTMLHRElement": {
21672169
"element": [
21682170
{
21692171
"name": "hr"
21702172
}
21712173
]
21722174
},
2175+
"HTMLHtmlElement": {
2176+
"element": [
2177+
{
2178+
"name": "html"
2179+
}
2180+
]
2181+
},
2182+
"HTMLLinkElement": {
2183+
"properties": {
2184+
"property": {
2185+
"disabled":{
2186+
"name": "disabled",
2187+
"type": "boolean"
2188+
}
2189+
}
2190+
},
2191+
"element": [
2192+
{
2193+
"name": "link"
2194+
}
2195+
]
2196+
},
21732197
"HTMLLIElement": {
21742198
"element": [
21752199
{
@@ -2184,6 +2208,13 @@
21842208
}
21852209
]
21862210
},
2211+
"HTMLMetaElement": {
2212+
"element": [
2213+
{
2214+
"name": "meta"
2215+
}
2216+
]
2217+
},
21872218
"HTMLModElement": {
21882219
"element": [
21892220
{
@@ -2254,6 +2285,13 @@
22542285
}
22552286
]
22562287
},
2288+
"HTMLStyleElement": {
2289+
"element": [
2290+
{
2291+
"name": "style"
2292+
}
2293+
]
2294+
},
22572295
"HTMLTableDataCellElement": {
22582296
"name": "HTMLTableDataCellElement",
22592297
"extends": "HTMLTableCellElement",
@@ -2291,6 +2329,13 @@
22912329
}
22922330
]
22932331
},
2332+
"HTMLTitleElement": {
2333+
"element": [
2334+
{
2335+
"name": "title"
2336+
}
2337+
]
2338+
},
22942339
"HTMLUListElement": {
22952340
"element": [
22962341
{

‎inputfiles/comments.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,8 @@
265265
"content": {
266266
"comment": "/**\r\n * Gets or sets meta-information to associate with httpEquiv or name.\r\n */"
267267
},
268-
"url": {
269-
"comment": "/**\r\n * Sets or retrieves the URL property that will be loaded after the specified time has elapsed.\r\n */"
270-
},
271268
"scheme": {
272269
"comment": "/**\r\n * Sets or retrieves a scheme to be used in interpreting the value of a property specified for the object.\r\n */"
273-
},
274-
"charset": {
275-
"comment": "/**\r\n * Sets or retrieves the character set used to encode the object.\r\n */"
276270
}
277271
}
278272
}

‎inputfiles/idl/HTML - Semantics.commentmap.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"title-text": "Returns the child text content of the element.\nCan be set, to replace the element's children with the given value."
3+
}

‎inputfiles/idl/HTML - Semantics.widl

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
[Exposed=Window,
2+
HTMLConstructor]
3+
interface HTMLHtmlElement : HTMLElement {};
4+
5+
[Exposed=Window,
6+
HTMLConstructor]
7+
interface HTMLHeadElement : HTMLElement {};
8+
9+
[Exposed=Window,
10+
HTMLConstructor]
11+
interface HTMLTitleElement : HTMLElement {
12+
[CEReactions] attribute DOMString text;
13+
};
14+
15+
[Exposed=Window,
16+
HTMLConstructor]
17+
interface HTMLBaseElement : HTMLElement {
18+
[CEReactions] attribute USVString href;
19+
[CEReactions] attribute DOMString target;
20+
};
21+
22+
[Exposed=Window,
23+
HTMLConstructor]
24+
interface HTMLLinkElement : HTMLElement {
25+
[CEReactions] attribute USVString href;
26+
[CEReactions] attribute DOMString? crossOrigin;
27+
[CEReactions] attribute DOMString rel;
28+
[CEReactions] attribute DOMString as; // (default "")
29+
[SameObject, PutForwards=value] readonly attribute DOMTokenList relList;
30+
[CEReactions] attribute DOMString media;
31+
[CEReactions] attribute DOMString integrity;
32+
[CEReactions] attribute DOMString hreflang;
33+
[CEReactions] attribute DOMString type;
34+
[SameObject, PutForwards=value] readonly attribute DOMTokenList sizes;
35+
[CEReactions] attribute DOMString referrerPolicy;
36+
};
37+
HTMLLinkElement includes LinkStyle;
38+
39+
[Exposed=Window,
40+
HTMLConstructor]
41+
interface HTMLMetaElement : HTMLElement {
42+
[CEReactions] attribute DOMString name;
43+
[CEReactions] attribute DOMString httpEquiv;
44+
[CEReactions] attribute DOMString content;
45+
};
46+
47+
[Exposed=Window,
48+
HTMLConstructor]
49+
interface HTMLStyleElement : HTMLElement {
50+
[CEReactions] attribute DOMString media;
51+
};
52+
HTMLStyleElement includes LinkStyle;

‎inputfiles/idlSources.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@
6969
"title": "HTML - Obsolete features",
7070
"deprecated": true
7171
},
72+
{
73+
"url": "https://html.spec.whatwg.org/multipage/semantics.html",
74+
"title": "HTML - Semantics"
75+
},
7276
{
7377
"url": "https://html.spec.whatwg.org/multipage/text-level-semantics.html",
7478
"title": "HTML - Text level semantics"

‎inputfiles/overridingTypes.json

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -235,23 +235,6 @@
235235
}
236236
}
237237
},
238-
"HTMLLinkElement": {
239-
"name": "HTMLLinkElement",
240-
"properties": {
241-
"property": {
242-
"disabled":{
243-
"deprecated": 0,
244-
"name": "disabled",
245-
"type": "boolean"
246-
},
247-
"relList": {
248-
"read-only": 1,
249-
"name": "relList",
250-
"type": "DOMTokenList"
251-
}
252-
}
253-
}
254-
},
255238
"SourceBuffer": {
256239
"specs": "media-source",
257240
"name": "SourceBuffer",

0 commit comments

Comments
 (0)