From a3fe0b72d5d5515d0bcdccbfeefdd7a8cad5283a Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Mon, 17 Jul 2017 17:04:20 -0500 Subject: [PATCH] Placed worklets implementation behind a pref. --- components/script/dom/webidls/CSSStyleValue.webidl | 2 +- components/script/dom/webidls/PaintRenderingContext2D.webidl | 2 +- components/script/dom/webidls/PaintSize.webidl | 2 +- components/script/dom/webidls/PaintWorkletGlobalScope.webidl | 2 +- components/script/dom/webidls/StylePropertyMapReadOnly.webidl | 2 +- components/script/dom/webidls/TestWorkletGlobalScope.webidl | 2 +- components/script/dom/webidls/Window.webidl | 2 +- components/script/dom/webidls/Worklet.webidl | 2 +- components/script/dom/webidls/WorkletGlobalScope.webidl | 2 +- tests/wpt/mozilla/meta/MANIFEST.json | 2 +- tests/wpt/mozilla/meta/mozilla/css-paint-api/__dir__.ini | 1 + tests/wpt/mozilla/meta/mozilla/worklets/__dir__.ini | 1 + tests/wpt/mozilla/tests/mozilla/interfaces.html | 1 - 13 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 tests/wpt/mozilla/meta/mozilla/css-paint-api/__dir__.ini create mode 100644 tests/wpt/mozilla/meta/mozilla/worklets/__dir__.ini diff --git a/components/script/dom/webidls/CSSStyleValue.webidl b/components/script/dom/webidls/CSSStyleValue.webidl index 7f9ab308ff1c..c540ae7824ba 100644 --- a/components/script/dom/webidls/CSSStyleValue.webidl +++ b/components/script/dom/webidls/CSSStyleValue.webidl @@ -4,7 +4,7 @@ // https://drafts.css-houdini.org/css-typed-om-1/#cssstylevalue // NOTE: should this be exposed to Window? -[Exposed=(Worklet)] +[Pref="dom.worklet.enabled", Exposed=(Worklet)] interface CSSStyleValue { stringifier; // static CSSStyleValue? parse(DOMString property, DOMString cssText); diff --git a/components/script/dom/webidls/PaintRenderingContext2D.webidl b/components/script/dom/webidls/PaintRenderingContext2D.webidl index d2097bd4f7c3..a3ec694a855c 100644 --- a/components/script/dom/webidls/PaintRenderingContext2D.webidl +++ b/components/script/dom/webidls/PaintRenderingContext2D.webidl @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://drafts.css-houdini.org/css-paint-api/#paintrenderingcontext2d -[Exposed=PaintWorklet] +[Pref="dom.worklet.enabled", Exposed=PaintWorklet] interface PaintRenderingContext2D { }; PaintRenderingContext2D implements CanvasState; diff --git a/components/script/dom/webidls/PaintSize.webidl b/components/script/dom/webidls/PaintSize.webidl index 6f90416401ab..c70fe3aa77bf 100644 --- a/components/script/dom/webidls/PaintSize.webidl +++ b/components/script/dom/webidls/PaintSize.webidl @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://drafts.css-houdini.org/css-paint-api/#paintsize -[Exposed=PaintWorklet] +[Pref="dom.worklet.enabled", Exposed=PaintWorklet] interface PaintSize { readonly attribute double width; readonly attribute double height; diff --git a/components/script/dom/webidls/PaintWorkletGlobalScope.webidl b/components/script/dom/webidls/PaintWorkletGlobalScope.webidl index 95d4388866b8..5592d48d148f 100644 --- a/components/script/dom/webidls/PaintWorkletGlobalScope.webidl +++ b/components/script/dom/webidls/PaintWorkletGlobalScope.webidl @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://drafts.css-houdini.org/css-paint-api/#paintworkletglobalscope -[Global=(Worklet,PaintWorklet), Exposed=PaintWorklet] +[Global=(Worklet,PaintWorklet), Pref="dom.worklet.enabled", Exposed=PaintWorklet] interface PaintWorkletGlobalScope : WorkletGlobalScope { [Throws] void registerPaint(DOMString name, VoidFunction paintCtor); }; diff --git a/components/script/dom/webidls/StylePropertyMapReadOnly.webidl b/components/script/dom/webidls/StylePropertyMapReadOnly.webidl index 6ff50ac4be99..7557a0d60718 100644 --- a/components/script/dom/webidls/StylePropertyMapReadOnly.webidl +++ b/components/script/dom/webidls/StylePropertyMapReadOnly.webidl @@ -4,7 +4,7 @@ // https://drafts.css-houdini.org/css-typed-om-1/#stylepropertymapreadonly // NOTE: should this be exposed to Window? -[Exposed=(Worklet)] +[Pref="dom.worklet.enabled", Exposed=(Worklet)] interface StylePropertyMapReadOnly { CSSStyleValue? get(DOMString property); // sequence getAll(DOMString property); diff --git a/components/script/dom/webidls/TestWorkletGlobalScope.webidl b/components/script/dom/webidls/TestWorkletGlobalScope.webidl index 44027ab8dc63..94c3b59ae87a 100644 --- a/components/script/dom/webidls/TestWorkletGlobalScope.webidl +++ b/components/script/dom/webidls/TestWorkletGlobalScope.webidl @@ -5,7 +5,7 @@ // This interface is entirely internal to Servo, and should not be accessible to // web pages. -[Global=(Worklet,TestWorklet), Exposed=TestWorklet] +[Global=(Worklet,TestWorklet), Pref="dom.worklet.enabled", Exposed=TestWorklet] interface TestWorkletGlobalScope : WorkletGlobalScope { void registerKeyValue(DOMString key, DOMString value); }; diff --git a/components/script/dom/webidls/Window.webidl b/components/script/dom/webidls/Window.webidl index 50808c830165..e73120df564b 100644 --- a/components/script/dom/webidls/Window.webidl +++ b/components/script/dom/webidls/Window.webidl @@ -206,5 +206,5 @@ partial interface Window { // https://drafts.css-houdini.org/css-paint-api-1/#paint-worklet partial interface Window { - [SameObject] readonly attribute Worklet paintWorklet; + [SameObject, Pref="dom.worklet.enabled"] readonly attribute Worklet paintWorklet; }; diff --git a/components/script/dom/webidls/Worklet.webidl b/components/script/dom/webidls/Worklet.webidl index 5bb39bebd96b..c8e4534d4b16 100644 --- a/components/script/dom/webidls/Worklet.webidl +++ b/components/script/dom/webidls/Worklet.webidl @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://drafts.css-houdini.org/worklets/#worklet -[Exposed=(Window)] +[Pref="dom.worklet.enabled", Exposed=(Window)] interface Worklet { [NewObject] Promise addModule(USVString moduleURL, optional WorkletOptions options); }; diff --git a/components/script/dom/webidls/WorkletGlobalScope.webidl b/components/script/dom/webidls/WorkletGlobalScope.webidl index ca29296a10ed..90c2ecb90b1c 100644 --- a/components/script/dom/webidls/WorkletGlobalScope.webidl +++ b/components/script/dom/webidls/WorkletGlobalScope.webidl @@ -5,6 +5,6 @@ // https://drafts.css-houdini.org/worklets/#workletglobalscope // TODO: The spec IDL doesn't make this a subclass of EventTarget // https://github.com/whatwg/html/issues/2611 -[Exposed=Worklet] +[Pref="dom.worklet.enabled", Exposed=Worklet] interface WorkletGlobalScope: GlobalScope { }; diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index ddd21a26cc8d..43f8f110eddc 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -27241,7 +27241,7 @@ "testharness" ], "mozilla/interfaces.html": [ - "ffdc606aaf989ef8bcdecef8cef8764bbb2ae1b2", + "c884fee8603f93099ffd0acc30f0ab0cbee5b5f8", "testharness" ], "mozilla/interfaces.js": [ diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/__dir__.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/__dir__.ini new file mode 100644 index 000000000000..3bd8f8ce1a58 --- /dev/null +++ b/tests/wpt/mozilla/meta/mozilla/css-paint-api/__dir__.ini @@ -0,0 +1 @@ +prefs: [dom.worklet.enabled:true] diff --git a/tests/wpt/mozilla/meta/mozilla/worklets/__dir__.ini b/tests/wpt/mozilla/meta/mozilla/worklets/__dir__.ini new file mode 100644 index 000000000000..3bd8f8ce1a58 --- /dev/null +++ b/tests/wpt/mozilla/meta/mozilla/worklets/__dir__.ini @@ -0,0 +1 @@ +prefs: [dom.worklet.enabled:true] diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html index 0400a013bd01..33aa76d04810 100644 --- a/tests/wpt/mozilla/tests/mozilla/interfaces.html +++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html @@ -201,7 +201,6 @@ "WebSocket", "Window", "Worker", - "Worklet", "XMLDocument", "XMLHttpRequest", "XMLHttpRequestEventTarget",