CustomElementRegistry.upgrade works by current spec

pshaughn · pshaughn · commit 065bcee37184 · 2020-01-01T22:23:44.000-05:00
diff --git a/components/script/dom/customelementregistry.rs b/components/script/dom/customelementregistry.rs
@@ -448,6 +448,17 @@ impl CustomElementRegistryMethods for CustomElementRegistry {
         // Step 6
         promise
     }
+    /// https://html.spec.whatwg.org/multipage/#dom-customelementregistry-upgrade
+    fn Upgrade(&self, node: &Node) {
+        // Spec says to make a list first and then iterate the list, but
+        // try-to-upgrade only queues upgrade reactions and doesn't itself
+        // modify the tree, so that's not an observable distinction.
+        node.traverse_preorder(ShadowIncluding::Yes).for_each(|n| {
+            if let Some(element) = n.downcast::<Element>() {
+                try_upgrade_element(element);
+            }
+        });
+    }
 }
 
 #[derive(Clone, JSTraceable, MallocSizeOf)]
diff --git a/components/script/dom/webidls/CustomElementRegistry.webidl b/components/script/dom/webidls/CustomElementRegistry.webidl
@@ -11,6 +11,8 @@ interface CustomElementRegistry {
   any get(DOMString name);
 
   Promise<void> whenDefined(DOMString name);
+
+  [CEReactions] void upgrade(Node root);
 };
 
 callback CustomElementConstructor = HTMLElement();
diff --git a/tests/wpt/metadata/custom-elements/custom-element-registry/upgrade.html.ini b/tests/wpt/metadata/custom-elements/custom-element-registry/upgrade.html.ini
@@ -1,16 +1,4 @@
 [upgrade.html]
-  [Upgrading an element directly (example from the spec)]
-    expected: FAIL
-
-  [Two elements as children of the upgraded node]
-    expected: FAIL
-
-  [Two elements as descendants of the upgraded node]
-    expected: FAIL
-
   [Two elements as shadow-including descendants (and not descendants) of the upgraded node]
     expected: FAIL
 
-  [Elements inside a template contents DocumentFragment node]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/dom/idlharness.https.html.ini b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
@@ -62,9 +62,6 @@
   [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "getTransform()" with the proper type]
     expected: FAIL
 
-  [CustomElementRegistry interface: operation upgrade(Node)]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute imageSmoothingEnabled]
     expected: FAIL
 
