From 8d55e38992c971351e399248719b88bd2f320f54 Mon Sep 17 00:00:00 2001 From: Jinho Bang Date: Mon, 18 Dec 2017 18:52:03 +0900 Subject: [PATCH] Use new mixin syntax dom.idl Helps with https://github.com/whatwg/dom/issues/532. --- interfaces/dom.idl | 52 ++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/interfaces/dom.idl b/interfaces/dom.idl index fce74328043edb..25324787d719be 100644 --- a/interfaces/dom.idl +++ b/interfaces/dom.idl @@ -79,26 +79,20 @@ interface AbortSignal : EventTarget { }; -[NoInterfaceObject, - Exposed=Window] -interface NonElementParentNode { +interface mixin NonElementParentNode { Element? getElementById(DOMString elementId); }; -Document implements NonElementParentNode; -DocumentFragment implements NonElementParentNode; +Document includes NonElementParentNode; +DocumentFragment includes NonElementParentNode; -[NoInterfaceObject, - Exposed=Window] -interface DocumentOrShadowRoot { +interface mixin DocumentOrShadowRoot { }; -Document implements DocumentOrShadowRoot; -ShadowRoot implements DocumentOrShadowRoot; +Document includes DocumentOrShadowRoot; +ShadowRoot includes DocumentOrShadowRoot; -[NoInterfaceObject, - Exposed=Window] -interface ParentNode { +interface mixin ParentNode { [SameObject] readonly attribute HTMLCollection children; readonly attribute Element? firstElementChild; readonly attribute Element? lastElementChild; @@ -110,41 +104,35 @@ interface ParentNode { Element? querySelector(DOMString selectors); [NewObject] NodeList querySelectorAll(DOMString selectors); }; -Document implements ParentNode; -DocumentFragment implements ParentNode; -Element implements ParentNode; +Document includes ParentNode; +DocumentFragment includes ParentNode; +Element includes ParentNode; -[NoInterfaceObject, - Exposed=Window] -interface NonDocumentTypeChildNode { +interface mixin NonDocumentTypeChildNode { readonly attribute Element? previousElementSibling; readonly attribute Element? nextElementSibling; }; -Element implements NonDocumentTypeChildNode; -CharacterData implements NonDocumentTypeChildNode; +Element includes NonDocumentTypeChildNode; +CharacterData includes NonDocumentTypeChildNode; -[NoInterfaceObject, - Exposed=Window] -interface ChildNode { +interface mixin ChildNode { [Unscopable] void before((Node or DOMString)... nodes); [Unscopable] void after((Node or DOMString)... nodes); [Unscopable] void replaceWith((Node or DOMString)... nodes); [Unscopable] void remove(); }; -DocumentType implements ChildNode; -Element implements ChildNode; -CharacterData implements ChildNode; +DocumentType includes ChildNode; +Element includes ChildNode; +CharacterData includes ChildNode; -[NoInterfaceObject, - Exposed=Window] -interface Slotable { +interface mixin Slotable { readonly attribute HTMLSlotElement? assignedSlot; }; -Element implements Slotable; -Text implements Slotable; +Element includes Slotable; +Text includes Slotable; [Exposed=Window]