servo · bors-servo · Jul 10, 2020 · Jul 10, 2020 · Jul 10, 2020
diff --git a/components/config/prefs.rs b/components/config/prefs.rs
@@ -134,7 +134,6 @@ mod gen {
                     }
                 },
                 canvas_text: {
-                    #[serde(rename = "dom.canvas-text.enabled")]
                     enabled: bool,
                 },
                 composition_event: {

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -1672,8 +1672,27 @@ def __init__(self, descriptor, name, static, unforgeable):
                          "condition": PropertyDefiner.getControllingCondition(m, descriptor)}
                         for m in methods]
 
-        # FIXME Check for an existing iterator on the interface first.
-        if any(m.isGetter() and m.isIndexed() for m in methods):
+        # TODO: Once iterable is implemented, use tiebreak rules instead of
+        # failing. Also, may be more tiebreak rules to implement once spec bug
+        # is resolved.
+        # https://www.w3.org/Bugs/Public/show_bug.cgi?id=28592
+        def hasIterator(methods, regular):
+            return (any("@@iterator" in m.aliases for m in methods)
+                    or any("@@iterator" == r["name"] for r in regular))
+
+        # Check whether we need to output an @@iterator due to having an indexed
+        # getter.  We only do this while outputting non-static and
+        # non-unforgeable methods, since the @@iterator function will be
+        # neither.
+        if (not static
+            and not unforgeable
+            and descriptor.supportsIndexedProperties()):  # noqa
+            if hasIterator(methods, self.regular):  # noqa
+                raise TypeError("Cannot have indexed getter/attr on "
+                                "interface %s with other members "
+                                "that generate @@iterator, such as "
+                                "maplike/setlike or aliased functions." %
+                                self.descriptor.interface.identifier.name)
             self.regular.append({"name": '@@iterator',
                                  "methodInfo": False,
                                  "selfHostedName": "$ArrayValues",
@@ -2662,7 +2681,7 @@ def definition_body(self):
         pref = iface.getExtendedAttribute("Pref")
         if pref:
             assert isinstance(pref, list) and len(pref) == 1
-            conditions.append('prefs::pref_map().get("%s").as_bool().unwrap_or(false)' % pref[0])
+            conditions.append('pref!(%s)' % pref[0])
 
         func = iface.getExtendedAttribute("Func")
         if func:

diff --git a/components/script/dom/bindings/codegen/Configuration.py b/components/script/dom/bindings/codegen/Configuration.py
@@ -401,6 +401,9 @@ def getParentName(self):
             parent = parent.parent
         return None
 
+    def supportsIndexedProperties(self):
+        return self.operations['IndexedGetter'] is not None
+
     def hasDescendants(self):
         return (self.interface.getUserData("hasConcreteDescendant", False)
                 or self.interface.getUserData("hasProxyDescendant", False))

diff --git a/components/script/dom/webidls/CanvasRenderingContext2D.webidl b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
@@ -148,12 +148,12 @@ interface mixin CanvasUserInterface {
 [Exposed=(PaintWorklet, Window, Worker)]
 interface mixin CanvasText {
   // text (see also the CanvasPathDrawingStyles and CanvasTextDrawingStyles interfaces)
-  [Pref="dom.canvas-text.enabled"]
+  [Pref="dom.canvas_text.enabled"]
   void fillText(DOMString text, unrestricted double x, unrestricted double y,
                 optional unrestricted double maxWidth);
   //void strokeText(DOMString text, unrestricted double x, unrestricted double y,
   //                optional unrestricted double maxWidth);
-  [Pref="dom.canvas-text.enabled"]
+  [Pref="dom.canvas_text.enabled"]
   TextMetrics measureText(DOMString text);
 };
 

diff --git a/components/script/dom/webidls/CompositionEvent.webidl b/components/script/dom/webidls/CompositionEvent.webidl
@@ -8,7 +8,7 @@
  */
 
 // https://w3c.github.io/uievents/#idl-compositionevent
-[Exposed=Window, Pref="dom.compositionevent.enabled"]
+[Exposed=Window, Pref="dom.composition_event.enabled"]
 interface CompositionEvent : UIEvent {
   [Throws] constructor(DOMString type, optional CompositionEventInit eventInitDict = {});
   readonly attribute DOMString data;

diff --git a/components/script/dom/webidls/CustomElementRegistry.webidl b/components/script/dom/webidls/CustomElementRegistry.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#customelementregistry
-[Exposed=Window, Pref="dom.customelements.enabled"]
+[Exposed=Window, Pref="dom.custom_elements.enabled"]
 interface CustomElementRegistry {
   [Throws, CEReactions]
   void define(DOMString name, CustomElementConstructor constructor_, optional ElementDefinitionOptions options = {});

diff --git a/components/script/dom/webidls/TextMetrics.webidl b/components/script/dom/webidls/TextMetrics.webidl
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // https://html.spec.whatwg.org/multipage/#textmetrics
-[Exposed=(PaintWorklet, Window, Worker), Pref="dom.canvas-text.enabled"]
+[Exposed=(PaintWorklet, Window, Worker), Pref="dom.canvas_text.enabled"]
 interface TextMetrics {
   // x-direction
   readonly attribute double width; // advance width

diff --git a/resources/prefs.json b/resources/prefs.json
@@ -1,7 +1,7 @@
 {
   "dom.bluetooth.enabled": false,
   "dom.bluetooth.testing.enabled": false,
-  "dom.canvas-text.enabled": true,
+  "dom.canvas_text.enabled": true,
   "dom.compositionevent.enabled": false,
   "dom.customelements.enabled": true,
   "dom.document.dblclick_dist": 1,

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
@@ -528290,6 +528290,13 @@
       {}
      ]
     ],
+    "xrInputSourceArray_iterable.html": [
+     "de784d5d1a60fc15c0bea92e65a8a2a3ef0acf97",
+     [
+      null,
+      {}
+     ]
+    ],
     "xrInputSource_add_remove.https.html": [
      "7764017910d2e5ada78febe954e9543aca89226b",
      [

diff --git a/tests/wpt/metadata/html/canvas/__dir__.ini b/tests/wpt/metadata/html/canvas/__dir__.ini
@@ -1 +1 @@
-prefs: ["dom.canvas-text.enabled:false","dom.offscreen_canvas.enabled:true"]
+prefs: ["dom.offscreen_canvas.enabled:true"]
diff --git a/...ta/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.NaN.html.ini b/...ta/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.NaN.html.ini
diff --git a/...ml/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html.ini b/...ml/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html.ini
diff --git a/...ml/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html.ini b/...ml/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html.ini
diff --git a/.../html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html.ini b/.../html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html.ini
diff --git a/...a/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html.ini b/...a/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html.ini
diff --git a/...data/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html.ini b/...data/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html.ini
diff --git a/...pt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.html.ini b/...pt/metadata/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.html.ini
diff --git a/...a/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini b/...a/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini
diff --git a/...data/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html.ini b/...data/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html.ini
diff --git a/tests/wpt/metadata/html/canvas/element/manual/text-styles/canvas_text_font_001.htm.ini b/tests/wpt/metadata/html/canvas/element/manual/text-styles/canvas_text_font_001.htm.ini
diff --git a/...s/wpt/metadata/html/canvas/element/text-styles/2d.text.draw.space.collapse.start.html.ini b/...s/wpt/metadata/html/canvas/element/text-styles/2d.text.draw.space.collapse.start.html.ini
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html.ini
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js.ini
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html.ini
diff --git a/...wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js.ini b/...wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js.ini
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html.ini
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js.ini
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html.ini
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js.ini
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html.ini
diff --git a/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js.ini b/tests/wpt/metadata/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js.ini
diff --git a/tests/wpt/metadata/webxr/idlharness.https.window.js.ini b/tests/wpt/metadata/webxr/idlharness.https.window.js.ini
@@ -2,9 +2,6 @@
   [XR interface: attribute ondevicechange]
     expected: FAIL
 
-  [XRInputSourceArray interface: iterable<XRInputSource>]
-    expected: FAIL
-
   [XR interface: calling supportsSession(XRSessionMode) on navigator.xr with too few arguments must throw TypeError]
     expected: FAIL
 

diff --git a/tests/wpt/web-platform-tests/webxr/xrInputSourceArray_iterable.html b/tests/wpt/web-platform-tests/webxr/xrInputSourceArray_iterable.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/webxr_util.js"></script>
+<script src="resources/webxr_test_constants.js"></script>
+<canvas id="webgl-canvas"></canvas>
+<script>
+let testName = "XRInputSourceArray is iterable";
+let testFunction = function(session, fakeDeviceController, t) {
+  return new Promise((resolve) => {
+    let input_source = fakeDeviceController.simulateInputSourceConnection({
+      handedness: "right",
+      targetRayMode: "tracked-pointer",
+      pointerOrigin: VALID_POINTER_TRANSFORM,
+      gripOrigin: VALID_GRIP_TRANSFORM,
+      profiles: ["foo", "bar"]
+    });
+
+    requestSkipAnimationFrame(session, (time, xrFrame) => {
+        let sources = [];
+        t.step(() => {
+            for (const source of session.inputSources) {
+                sources.push(source);
+            }
+            assert_equals(sources.length, 1);
+        });
+        resolve();
+    });
+  });
+};
+
+xr_session_promise_test(
+  testName, testFunction, TRACKED_IMMERSIVE_DEVICE, 'immersive-vr');
+</script>
diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini
@@ -1,6 +1,4 @@
 [oes-texture-float-with-canvas.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #285: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
     expected: FAIL

diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini
@@ -1,6 +1,4 @@
 [oes-texture-half-float-with-canvas.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #285: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
     expected: FAIL

diff --git a/.../webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini b/.../webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-luminance-luminance-unsigned_byte.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #33: font missing]
     expected: FAIL

diff --git a/...conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini b/...conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #245: font missing]
     expected: FAIL

diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-rgb-rgb-unsigned_byte.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #399: font missing]
     expected: FAIL

diff --git a/...s/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini b/...s/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-rgb-rgb-unsigned_short_5_6_5.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #273: font missing]
     expected: FAIL

diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-rgba-rgba-unsigned_byte.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #399: font missing]
     expected: FAIL

diff --git a/...t/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini b/...t/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #241: font missing]
     expected: FAIL

diff --git a/...t/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini b/...t/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
@@ -1,6 +1,4 @@
 [tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html]
-  bug: https://github.com/servo/servo/issues/11681
-  prefs: [dom.canvas-text.enabled:true]
   expected: ERROR
   [WebGL test #241: font missing]
     expected: FAIL