resolve conflict

resolve conflict

Author: YuichiNukiyama

baselines/dom.generated.d.ts

@@ -10370,17 +10370,16 @@ declare var Storage: {
 }
 
 interface StorageEvent extends Event {
-    key: string;
-    newValue: any;
-    oldValue: any;
-    storageArea: Storage;
     url: string;
-    initStorageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, keyArg: string, oldValueArg: any, newValueArg: any, urlArg: string, storageAreaArg: Storage): void;
+    key?: string;
+    oldValue?: string;
+    newValue?: string;
+    storageArea?: Storage;
 }
 
 declare var StorageEvent: {
     prototype: StorageEvent;
-    new(): StorageEvent;
+    new (type: string, eventInitDict?: StorageEventInit): StorageEvent;
 }
 
 interface StyleMedia {
@@ -12580,6 +12579,14 @@ interface XMLHttpRequestEventTarget {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface StorageEventInit extends EventInit {
+    key?: string;
+    oldValue?: string;
+    newValue?: string;
+    url: string;
+    storageArea?: Storage;
+}
+
 interface IDBObjectStoreParameters {
     keyPath?: string | string[];
     autoIncrement?: boolean;

inputfiles/addedTypes.json

@@ -1,4 +1,32 @@
 [
+    {
+        "kind": "interface",
+        "name": "StorageEventInit",
+        "flavor":  "Web",
+        "extends": "EventInit",
+        "properties": [
+            {
+                "name": "key?",
+                "type": "string"
+            },
+            {
+                "name": "oldValue?",
+                "type": "string"
+            },
+            {
+                "name": "newValue?",
+                "type": "string"
+            },
+            {
+                "name": "url",
+                "type": "string"
+            },
+            {
+                "name": "storageArea?",
+                "type": "Storage"
+            }
+        ]
+    },
     {
         "kind": "interface",
         "name": "IDBObjectStoreParameters",
@@ -308,5 +336,29 @@
         "interface": "HTMLCanvasElement",
         "name": "toBlob",
         "signatures": ["toBlob(): Blob"]
+    },
+    {
+        "kind": "property",
+        "interface": "StorageEvent",
+        "name": "key?",
+        "type": "string"
+    },
+    {
+        "kind": "property",
+        "interface": "StorageEvent",
+        "name": "oldValue?",
+        "type": "string"
+    },
+    {
+        "kind": "property",
+        "interface": "StorageEvent",
+        "name": "newValue?",
+        "type": "string"
+    },
+    {
+        "kind": "property",
+        "interface": "StorageEvent",
+        "name": "storageArea?",
+        "type": "Storage"
     }
 ]

inputfiles/overridingTypes.json

@@ -313,6 +313,13 @@
         "interface": "DataTransferItemList",
         "signatures": ["[index: number]: DataTransferItem"]
     },
+    {
+        "kind": "constructor",
+        "interface": "StorageEvent",
+        "signatures": [
+            "new (type: string, eventInitDict?: StorageEventInit): StorageEvent"
+        ]
+    },
     {
         "kind": "method",
         "interface": "Window",

inputfiles/removedTypes.json

@@ -18,5 +18,30 @@
         "kind": "method",
         "interface": "HTMLElement",
         "name": "contains"
+    },
+    {
+        "kind": "method",
+        "interface": "StorageEvent",
+        "name": "initStorageEvent"
+    },
+    {
+        "kind": "property",
+        "interface": "StorageEvent",
+        "name": "key"
+    },
+    {
+        "kind": "property",
+        "interface": "StorageEvent",
+        "name": "oldValue"
+    },
+    {
+        "kind": "property",
+        "interface": "StorageEvent",
+        "name": "newValue"
+    },
+    {
+        "kind": "property",
+        "interface": "StorageEvent",
+        "name": "storageArea"
     }
 ]