Merge remote-tracking branch 'refs/remotes/Microsoft/master'

saschanaz · saschanaz · commit e00ac366d6a7 · 2017-03-20T20:00:47.000+09:00
diff --git a/TS.fsx b/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
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -3675,6 +3675,16 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByClassName(classNames: string): NodeListOf<Element>;
     matches(selector: string): boolean;
     closest(selector: string): Element | null;
+    scrollIntoView(arg?: boolean | ScrollIntoViewOptions): void;
+    scroll(options?: ScrollToOptions): void;
+    scroll(x: number, y: number): void;
+    scrollTo(options?: ScrollToOptions): void;
+    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;
@@ -4446,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: {
@@ -4621,11 +4631,7 @@ 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;
-    scrollIntoView(top?: boolean): void;
     setActive(): void;
     addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -5890,6 +5896,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
       */
     type: string;
     import?: Document;
+    integrity: string;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6751,6 +6758,7 @@ interface HTMLScriptElement extends HTMLElement {
       * Sets or retrieves the MIME type for the associated scripting engine.
       */
     type: string;
+    integrity: string;
 }
 
 declare var HTMLScriptElement: {
@@ -7756,6 +7764,7 @@ interface KeyboardEvent extends UIEvent {
     readonly repeat: boolean;
     readonly shiftKey: boolean;
     readonly which: number;
+    readonly code: string;
     getModifierState(keyArg: string): boolean;
     initKeyboardEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, keyArg: string, locationArg: number, modifiersListArg: string, repeat: boolean, locale: string): void;
     readonly DOM_KEY_LOCATION_JOYSTICK: number;
@@ -9128,6 +9137,7 @@ interface PerformanceTiming {
     readonly responseStart: number;
     readonly unloadEventEnd: number;
     readonly unloadEventStart: number;
+    readonly secureConnectionStart: number;
     toJSON(): any;
 }
 
@@ -11405,8 +11415,8 @@ declare var StereoPannerNode: {
 interface Storage {
     readonly length: number;
     clear(): void;
-    getItem(key: string): string;
-    key(index: number): string;
+    getItem(key: string): string | null;
+    key(index: number): string | null;
     removeItem(key: string): void;
     setItem(key: string, data: string): void;
     [key: string]: any;
@@ -13002,6 +13012,9 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
     webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
     webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
+    scroll(options?: ScrollToOptions): void;
+    scrollTo(options?: ScrollToOptions): void;
+    scrollBy(options?: ScrollToOptions): 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;
@@ -14029,6 +14042,20 @@ interface ProgressEventInit extends EventInit {
     total?: number;
 }
 
+interface ScrollOptions {
+    behavior?: ScrollBehavior;
+}
+
+interface ScrollToOptions extends ScrollOptions {
+    left?: number;
+    top?: number;
+}
+
+interface ScrollIntoViewOptions extends ScrollOptions {
+    block?: ScrollLogicalPosition;
+    inline?: ScrollLogicalPosition;
+}
+
 interface ClipboardEventInit extends EventInit {
     data?: string;
     dataType?: string;
@@ -14072,7 +14099,7 @@ interface EcdsaParams extends Algorithm {
 }
 
 interface EcKeyGenParams extends Algorithm {
-    typedCurve: string;
+    namedCurve: string;
 }
 
 interface EcKeyAlgorithm extends KeyAlgorithm {
@@ -14425,6 +14452,9 @@ declare function webkitCancelAnimationFrame(handle: number): void;
 declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
 declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
 declare function webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
+declare function scroll(options?: ScrollToOptions): void;
+declare function scrollTo(options?: ScrollToOptions): void;
+declare function scrollBy(options?: ScrollToOptions): void;
 declare function toString(): string;
 declare function addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function dispatchEvent(evt: Event): boolean;
@@ -14580,6 +14610,8 @@ type MSOutboundPayload = MSVideoSendPayload | MSAudioSendPayload;
 type RTCIceGatherCandidate = RTCIceCandidate | RTCIceCandidateComplete;
 type RTCTransport = RTCDtlsTransport | RTCSrtpSdesTransport;
 type payloadtype = number;
+type ScrollBehavior = "auto" | "instant" | "smooth";
+type ScrollLogicalPosition = "start" | "center" | "end" | "nearest";
 type IDBValidKey = number | string | Date | IDBArrayKey;
 type BufferSource = ArrayBuffer | ArrayBufferView;
 type MouseWheelEvent = WheelEvent;
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
@@ -1000,7 +1000,7 @@ interface EcdsaParams extends Algorithm {
 }
 
 interface EcKeyGenParams extends Algorithm {
-    typedCurve: string;
+    namedCurve: string;
 }
 
 interface EcKeyAlgorithm extends KeyAlgorithm {
diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json
@@ -241,7 +241,106 @@
     {
         "kind": "method",
         "interface": "Element",
-        "signatures": ["closest(selector: string): Element | null"]
+        "signatures": [ "closest(selector: string): Element | null" ]
+    },
+    {
+        "kind": "typedef",
+        "flavor": "Web",
+        "name": "ScrollBehavior",
+        "type": "\"auto\" | \"instant\" | \"smooth\""
+    },
+    {
+        "kind": "interface",
+        "flavor": "Web",
+        "name": "ScrollOptions",
+        "properties": [
+            {
+                "name": "behavior?",
+                "type": "ScrollBehavior"
+            }
+        ]
+    },
+    {
+        "kind": "interface",
+        "flavor": "Web",
+        "name": "ScrollToOptions",
+        "extends": "ScrollOptions",
+        "properties": [
+            {
+                "name": "left?",
+                "type": "number"
+            },
+            {
+                "name": "top?",
+                "type": "number"
+            }
+        ]
+    },
+    {
+        "kind": "method",
+        "interface": "Window",
+        "signatures": [ "scroll(options?: ScrollToOptions): void" ]
+    },
+    {
+        "kind": "method",
+        "interface": "Window",
+        "signatures": [ "scrollTo(options?: ScrollToOptions): void" ]
+    },
+    {
+        "kind": "method",
+        "interface": "Window",
+        "signatures": [ "scrollBy(options?: ScrollToOptions): void" ]
+    },
+    {
+        "kind": "typedef",
+        "flavor": "Web",
+        "name": "ScrollLogicalPosition",
+        "type": "\"start\" | \"center\" | \"end\" | \"nearest\""
+    },
+    {
+        "kind": "interface",
+        "flavor": "Web",
+        "name": "ScrollIntoViewOptions",
+        "extends": "ScrollOptions",
+        "properties": [
+            {
+                "name": "block?",
+                "type": "ScrollLogicalPosition"
+            },
+            {
+                "name": "inline?",
+                "type": "ScrollLogicalPosition"
+            }
+        ]
+    },
+    {
+        "kind": "method",
+        "interface": "Element",
+        "signatures": [ "scrollIntoView(arg?: boolean | ScrollIntoViewOptions): void" ]
+    },
+    {
+        "kind": "method",
+        "interface": "Element",
+        "signatures": [
+            "scroll(options?: ScrollToOptions): void",
+            "scroll(x: number, y: number): void"
+        ]
+    },
+    {
+        "kind": "method",
+        "interface": "Element",
+        "signatures": [
+            "scrollTo(options?: ScrollToOptions): void",
+            "scrollTo(x: number, y: number): void"
+        ]
+    },
+    {
+        "kind": "method",
+        "interface": "Element",
+        "signatures": [
+            "scrollBy(options?: ScrollToOptions): void",
+            "scrollBy(x: number, y: number): void"
+        ]
     },
     {
         "kind": "indexer",
@@ -343,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",
@@ -554,7 +653,7 @@
         "extends": "Algorithm",
         "properties": [
             {
-                "name": "typedCurve",
+                "name": "namedCurve",
                 "type": "string"
             }
         ]
@@ -984,5 +1083,49 @@
         "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"]
+    },
+    {
+        "kind": "property",
+        "name": "secureConnectionStart",
+        "interface": "PerformanceTiming",
+        "readonly": true,
+        "type": "number"
+    },
+    {
+        "kind": "property",
+        "interface": "HTMLLinkElement",
+        "name": "integrity",
+        "type": "string"
+    },
+    {
+        "kind": "property",
+        "interface": "HTMLScriptElement",
+        "name": "integrity",
+        "type": "string"
+    },
+    {
+        "kind": "property",
+        "interface": "KeyboardEvent",
+        "readonly": true,
+        "name": "code",
+        "type": "string"
     }
 ]
diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
@@ -580,7 +580,13 @@
         "kind": "method",
         "interface": "Storage",
         "name": "getItem",
-        "signatures": ["getItem(key: string): string"]
+        "signatures": ["getItem(key: string): string | null"]
+    },
+    {
+        "kind": "method",
+        "interface": "Storage",
+        "name": "key",
+        "signatures": ["key(index: number): string | null"]
     },
     {
         "kind": "method",
diff --git a/inputfiles/removedTypes.json b/inputfiles/removedTypes.json
@@ -19,6 +19,11 @@
         "interface": "HTMLElement",
         "name": "contains"
     },
+    {
+        "kind": "method",
+        "interface": "HTMLElement",
+        "name": "scrollIntoView"
+    },
     {
         "kind": "method",
         "interface": "StorageEvent",
@@ -48,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"
     }
 ]

Original file line number	Diff line number	Diff line change
`@@ -1000,7 +1000,7 @@ interface EcdsaParams extends Algorithm {`
`1000`	`1000`	`}`
`1001`	`1001`
`1002`	`1002`	`interface EcKeyGenParams extends Algorithm {`
`1003`		`- typedCurve: string;`
	`1003`	`+ namedCurve: string;`
`1004`	`1004`	`}`
`1005`	`1005`
`1006`	`1006`	`interface EcKeyAlgorithm extends KeyAlgorithm {`