Skip to content

Commit 34f2e87

Browse files
author
Orta Therox
authored
Merge branch 'master' into beforeinput
2 parents 7997e14 + 488ab1f commit 34f2e87

File tree

5 files changed

+39
-7
lines changed

5 files changed

+39
-7
lines changed

baselines/dom.generated.d.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5764,6 +5764,9 @@ interface GlobalEventHandlersEventMap {
57645764
"change": Event;
57655765
"click": MouseEvent;
57665766
"close": Event;
5767+
"compositionend": CompositionEvent;
5768+
"compositionstart": CompositionEvent;
5769+
"compositionupdate": CompositionEvent;
57675770
"contextmenu": MouseEvent;
57685771
"cuechange": Event;
57695772
"dblclick": MouseEvent;
@@ -18538,7 +18541,7 @@ interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandler
1853818541
readonly event: Event | undefined;
1853918542
/** @deprecated */
1854018543
readonly external: External;
18541-
readonly frameElement: Element;
18544+
readonly frameElement: Element | null;
1854218545
readonly frames: Window;
1854318546
readonly history: History;
1854418547
readonly innerHeight: number;
@@ -19587,7 +19590,7 @@ declare var document: Document;
1958719590
declare var event: Event | undefined;
1958819591
/** @deprecated */
1958919592
declare var external: External;
19590-
declare var frameElement: Element;
19593+
declare var frameElement: Element | null;
1959119594
declare var frames: Window;
1959219595
declare var history: History;
1959319596
declare var innerHeight: number;
@@ -20139,7 +20142,7 @@ type OverSampleType = "2x" | "4x" | "none";
2013920142
type PanningModelType = "HRTF" | "equalpower";
2014020143
type PaymentComplete = "fail" | "success" | "unknown";
2014120144
type PaymentShippingType = "delivery" | "pickup" | "shipping";
20142-
type PermissionName = "accelerometer" | "ambient-light-sensor" | "background-sync" | "bluetooth" | "camera" | "clipboard" | "device-info" | "geolocation" | "gyroscope" | "magnetometer" | "microphone" | "midi" | "notifications" | "persistent-storage" | "push" | "speaker";
20145+
type PermissionName = "accelerometer" | "ambient-light-sensor" | "background-fetch" | "background-sync" | "bluetooth" | "camera" | "clipboard-read" | "clipboard-write" | "device-info" | "display-capture" | "geolocation" | "gyroscope" | "magnetometer" | "microphone" | "midi" | "nfc" | "notifications" | "persistent-storage" | "push" | "speaker";
2014320146
type PermissionState = "denied" | "granted" | "prompt";
2014420147
type PlaybackDirection = "alternate" | "alternate-reverse" | "normal" | "reverse";
2014520148
type PositionAlignSetting = "auto" | "center" | "line-left" | "line-right";

baselines/webworker.generated.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6001,7 +6001,7 @@ type KeyUsage = "decrypt" | "deriveBits" | "deriveKey" | "encrypt" | "sign" | "u
60016001
type NotificationDirection = "auto" | "ltr" | "rtl";
60026002
type NotificationPermission = "default" | "denied" | "granted";
60036003
type OffscreenRenderingContextId = "2d" | "bitmaprenderer" | "webgl" | "webgl2";
6004-
type PermissionName = "accelerometer" | "ambient-light-sensor" | "background-sync" | "bluetooth" | "camera" | "clipboard" | "device-info" | "geolocation" | "gyroscope" | "magnetometer" | "microphone" | "midi" | "notifications" | "persistent-storage" | "push" | "speaker";
6004+
type PermissionName = "accelerometer" | "ambient-light-sensor" | "background-fetch" | "background-sync" | "bluetooth" | "camera" | "clipboard-read" | "clipboard-write" | "device-info" | "display-capture" | "geolocation" | "gyroscope" | "magnetometer" | "microphone" | "midi" | "nfc" | "notifications" | "persistent-storage" | "push" | "speaker";
60056005
type PermissionState = "denied" | "granted" | "prompt";
60066006
type PremultiplyAlpha = "default" | "none" | "premultiply";
60076007
type PushEncryptionKeyName = "auth" | "p256dh";

inputfiles/addedTypes.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,18 @@
7373
"name": "beforeinput",
7474
"type": "InputEvent"
7575
},
76+
{
77+
"name": "compositionstart",
78+
"type": "CompositionEvent"
79+
},
80+
{
81+
"name": "compositionupdate",
82+
"type": "CompositionEvent"
83+
},
84+
{
85+
"name": "compositionend",
86+
"type": "CompositionEvent"
87+
},
7688
{
7789
"name": "focusin",
7890
"type": "FocusEvent"

inputfiles/idl/Permissions.widl

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ interface PermissionStatus : EventTarget {
1616

1717
[Exposed=(Window)]
1818
partial interface Navigator {
19-
readonly attribute Permissions permissions;
19+
[SameObject] readonly attribute Permissions permissions;
2020
};
2121

2222
[Exposed=(Worker)]
2323
partial interface WorkerNavigator {
24-
readonly attribute Permissions permissions;
24+
[SameObject] readonly attribute Permissions permissions;
2525
};
2626

2727
[Exposed=(Window,Worker)]
@@ -38,14 +38,18 @@ enum PermissionName {
3838
"microphone",
3939
"speaker",
4040
"device-info",
41+
"background-fetch",
4142
"background-sync",
4243
"bluetooth",
4344
"persistent-storage",
4445
"ambient-light-sensor",
4546
"accelerometer",
4647
"gyroscope",
4748
"magnetometer",
48-
"clipboard",
49+
"clipboard-read",
50+
"clipboard-write",
51+
"display-capture",
52+
"nfc",
4953
};
5054

5155
dictionary PushPermissionDescriptor : PermissionDescriptor {
@@ -59,3 +63,13 @@ dictionary MidiPermissionDescriptor : PermissionDescriptor {
5963
dictionary DevicePermissionDescriptor : PermissionDescriptor {
6064
DOMString deviceId;
6165
};
66+
67+
dictionary CameraDevicePermissionDescriptor : DevicePermissionDescriptor {
68+
boolean panTiltZoom = false;
69+
};
70+
71+
dictionary PermissionSetParameters {
72+
required PermissionDescriptor descriptor;
73+
required PermissionState state;
74+
boolean oneRealm = false;
75+
};

inputfiles/overridingTypes.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,9 @@
481481
"override-type": "Event | undefined",
482482
"deprecated": 1
483483
},
484+
"frameElement": {
485+
"nullable": 1
486+
},
484487
"location": {
485488
"read-only": 0
486489
},

0 commit comments

Comments
 (0)