fix body/frameset

Author: saschanaz

baselines/dom.generated.d.ts

@@ -5468,13 +5468,8 @@ declare var HTMLBaseFontElement: {
     new(): HTMLBaseFontElement;
 };
 
-interface HTMLBodyElementEventMap extends ElementEventMap, GlobalEventHandlersEventMap, DocumentAndElementEventHandlersEventMap, WindowEventHandlersEventMap {
-    "blur": FocusEvent;
-    "error": ErrorEvent;
-    "focus": FocusEvent;
-    "load": Event;
+interface HTMLBodyElementEventMap extends HTMLElementEventMap, WindowEventHandlersEventMap {
     "orientationchange": Event;
-    "scroll": UIEvent;
 }
 
 interface HTMLBodyElement extends HTMLElement, WindowEventHandlers {
@@ -6058,7 +6053,7 @@ declare var HTMLFrameElement: {
     new(): HTMLFrameElement;
 };
 
-interface HTMLFrameSetElementEventMap extends ElementEventMap, GlobalEventHandlersEventMap, DocumentAndElementEventHandlersEventMap, WindowEventHandlersEventMap {
+interface HTMLFrameSetElementEventMap extends HTMLElementEventMap, WindowEventHandlersEventMap {
 }
 
 interface HTMLFrameSetElement extends HTMLElement, WindowEventHandlers {

inputfiles/removedTypes.json

@@ -61,7 +61,12 @@
             "HTMLBodyElement": {
                 "properties": {
                     "property": {
-                        "onresize": null
+                        "onblur": null,
+                        "onerror": null,
+                        "onfocus": null,
+                        "onload": null,
+                        "onresize": null,
+                        "onscroll": null
                     }
                 }
             },

src/emitter.ts

@@ -187,7 +187,7 @@ export function emitWebIDl(webidl: Browser.WebIdl, flavor: Flavor) {
                     }
                     else if (e.deprecated) {
                         htmlDeprecatedResult[e.name] = i.name;
-                    } 
+                    }
                     else {
                         htmlResult[e.name] = i.name;
                     }
@@ -210,16 +210,20 @@ export function emitWebIDl(webidl: Browser.WebIdl, flavor: Flavor) {
 
     function getParentsWithEventHandler(i: Browser.Interface) {
         function getParentEventHandler(i: Browser.Interface): Browser.Interface[] {
-            return iNameToEhList[i.name] && iNameToEhList[i.name].length ? [i] : getParentsWithEventHandler(i);
+            const hasEventListener = iNameToEhList[i.name] && iNameToEhList[i.name].length;
+            if (hasEventListener) {
+                return [i];
+            }
+            const ehParents = getParentsWithEventHandler(i);
+            if (ehParents.length > 1) {
+                return [i];
+            }
+            return ehParents;
         }
 
         const extendedParentWithEventHandler = allInterfacesMap[i.extends] && getParentEventHandler(allInterfacesMap[i.extends]) || [];
         const implementedParentsWithEventHandler = i.implements ? flatMap(i.implements, i => getParentEventHandler(allInterfacesMap[i])) : [];
 
-        if (extendedParentWithEventHandler.length > 1 && implementedParentsWithEventHandler.length === 0) {
-            return [allInterfacesMap[i.extends]];
-        }
-
         return distinct(extendedParentWithEventHandler.concat(implementedParentsWithEventHandler));
     }
 
@@ -1083,7 +1087,7 @@ export function emitWebIDl(webidl: Browser.WebIdl, flavor: Flavor) {
                 const iterableGetter = findIterableGetter();
                 const lengthProperty = findLengthProperty(i) || findLengthProperty(allInterfacesMap[i.extends]);
                 if (iterableGetter && lengthProperty) {
-                    return [convertDomTypeToTsType({ 
+                    return [convertDomTypeToTsType({
                         type: iterableGetter.signature[0].type,
                         "override-type": iterableGetter.signature[0]["override-type"]
                     })];
@@ -1124,7 +1128,7 @@ export function emitWebIDl(webidl: Browser.WebIdl, flavor: Flavor) {
                 if (comments && comments[m.name]) {
                     printer.printLine(comments[m.name]);
                 }
-                printer.printLine(`${ m.name }(): ${ m.definition };`);
+                printer.printLine(`${m.name}(): ${m.definition};`);
             });
         }