merge conflicts

Author: saschanaz

TS.fsx

@@ -568,7 +568,7 @@ let EmitStaticInterface flavor (i:Browser.Interface) =
     // interface, and put the static members into the object literal type of 'declare var'
     // For static types with only static members, we put everything in the interface.
     // Because in the two cases the interface contains different things, it might be easier to
-    // read to seperate them into two functions.
+    // read to separate them into two functions.
     let emitStaticInterfaceWithNonStaticMembers () =
         Pt.resetIndent()
         EmitInterfaceDeclaration i

baselines/dom.generated.d.ts

@@ -3682,6 +3682,9 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     scrollTo(x: number, y: number): void;
     scrollBy(options?: ScrollToOptions): void;
     scrollBy(x: number, y: number): void;
+    insertAdjacentElement(position: string, insertedElement: Element): Element | null;
+    insertAdjacentHTML(where: string, html: string): void;
+    insertAdjacentText(where: string, text: string): void;
     addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -4453,7 +4456,7 @@ interface HTMLCanvasElement extends HTMLElement {
       * @param type The standard MIME type for the image format to return. If you do not specify this parameter, the default value is a PNG format image.
       */
     toDataURL(type?: string, ...args: any[]): string;
-    toBlob(callback: (result: Blob | null) => void, ... arguments: any[]): void;
+    toBlob(callback: (result: Blob | null) => void, type?: string, ...arguments: any[]): void;
 }
 
 declare var HTMLCanvasElement: {
@@ -4628,9 +4631,6 @@ interface HTMLElement extends Element {
     click(): void;
     dragDrop(): boolean;
     focus(): void;
-    insertAdjacentElement(position: string, insertedElement: Element): Element;
-    insertAdjacentHTML(where: string, html: string): void;
-    insertAdjacentText(where: string, text: string): void;
     msGetInputContext(): MSInputMethodContext;
     setActive(): void;
     addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;

inputfiles/addedTypes.json

@@ -442,7 +442,7 @@
         "kind": "method",
         "interface": "HTMLCanvasElement",
         "name": "toBlob",
-        "signatures": ["toBlob(callback: (result: Blob | null) => void, ... arguments: any[]): void"]
+        "signatures": ["toBlob(callback: (result: Blob | null) => void, type?: string, ...arguments: any[]): void"]
     },
     {
         "kind": "property",
@@ -1083,5 +1083,23 @@
         "name": "MouseWheelEvent",
         "flavor": "Web",
         "type": "WheelEvent"
+    },
+    {
+        "kind": "method",
+        "interface": "Element",
+        "name": "insertAdjacentElement",
+        "signatures": ["insertAdjacentElement(position: string, insertedElement: Element): Element | null"]
+    },
+    {
+        "kind": "method",
+        "interface": "Element",
+        "name": "insertAdjacentHTML",
+        "signatures": ["insertAdjacentHTML(where: string, html: string): void"]
+    },
+    {
+        "kind": "method",
+        "interface": "Element",
+        "name": "insertAdjacentText",
+        "signatures": ["insertAdjacentText(where: string, text: string): void"]
     }
 ]

inputfiles/removedTypes.json

@@ -53,5 +53,20 @@
         "kind": "property",
         "interface": "XMLHttpRequest",
         "name": "msCaching"
+    },
+    {
+        "kind": "method",
+        "interface": "HTMLElement",
+        "name": "insertAdjacentElement"
+    },
+    {
+        "kind": "method",
+        "interface": "HTMLElement",
+        "name": "insertAdjacentHTML"
+    },
+    {
+        "kind": "method",
+        "interface": "HTMLElement",
+        "name": "insertAdjacentText"
     }
 ]