[css-typed-om] update CSSUnparsedValue.idl

1. replace "DOMString or CSSVariableReferenceValue" with CSSUnparsedSegment using typedf keyword. 2. using sequence<> keyword instead of "..." in constructor w3c/css-houdini-drafts#619 Bug: 807525 Change-Id: I99c11c26dd2235e46e259e63991d0192a025bcb4 Reviewed-on: https://chromium-review.googlesource.com/904582 Reviewed-by: Darren Shen <shend@chromium.org> Commit-Queue: Hwanseung Lee <hs1217.lee@samsung.com> Cr-Commit-Position: refs/heads/master@{#534906}
web-platform-tests · Feb 7, 2018 · 384cb6d · 384cb6d
1 parent 3197bbb
commit 384cb6d
Show file tree

Hide file tree

Showing 19 changed files with 49 additions and 49 deletions.
diff --git a/css/css-typed-om/stylevalue-normalization/normalize-tokens.tentative.html b/css/css-typed-om/stylevalue-normalization/normalize-tokens.tentative.html
@@ -29,34 +29,34 @@
   {
     value: 'var(--A, 1em)',
     expectedResult: [
-      new CSSVariableReferenceValue('--A', new CSSUnparsedValue(' 1em')),
+      new CSSVariableReferenceValue('--A', new CSSUnparsedValue([' 1em'])),
     ]
   },
   {
     value: 'var(--A, var(--B))',
     expectedResult: [
-      new CSSVariableReferenceValue('--A', new CSSUnparsedValue(' ', new CSSVariableReferenceValue('--B'))),
+      new CSSVariableReferenceValue('--A', new CSSUnparsedValue([' ', new CSSVariableReferenceValue('--B')])),
     ]
   },
   {
     value: 'calc(42px + var(--foo, 15em) + var(--bar, var(--far) + 15px))',
     expectedResult: [
       'calc(42px + ',
-      new CSSVariableReferenceValue('--foo', new CSSUnparsedValue(' 15em')),
+      new CSSVariableReferenceValue('--foo', new CSSUnparsedValue([' 15em'])),
       ' + ',
-      new CSSVariableReferenceValue('--bar', new CSSUnparsedValue(' ', new CSSVariableReferenceValue('--far'), ' + 15px')),
+      new CSSVariableReferenceValue('--bar', new CSSUnparsedValue([' ', new CSSVariableReferenceValue('--far'), ' + 15px'])),
       ')',
     ]
   },
 ];
 
 for (const {value, expectedResult} of gTestCases) {
   test(t => {
-    assert_string_normalizes_to(t, 'color', value, new CSSUnparsedValue(...expectedResult));
+    assert_string_normalizes_to(t, 'color', value, new CSSUnparsedValue(expectedResult));
   }, 'Normalizing "' + value + '" on a CSS property returns correct CSSUnparsedValue');
 
   test(t => {
-    assert_string_normalizes_to(t, '--X', value, new CSSUnparsedValue(...expectedResult));
+    assert_string_normalizes_to(t, '--X', value, new CSSUnparsedValue(expectedResult));
   }, 'Normalizing "' + value + '" on a custom property returns correct CSSUnparsedValue');
 }
 

diff --git a/css/css-typed-om/stylevalue-serialization/cssUnparsedValue.html b/css/css-typed-om/stylevalue-serialization/cssUnparsedValue.html
@@ -11,25 +11,25 @@
 'use strict';
 
 test(() => {
-  assert_equals(new CSSUnparsedValue('lem', 'on', 'ade').toString(), 'lemonade');
+  assert_equals(new CSSUnparsedValue(['lem', 'on', 'ade']).toString(), 'lemonade');
 }, 'CSSUnparsedValue containing strings serializes to its concatenated contents');
 
 test(() => {
-  assert_equals(new CSSUnparsedValue(
+  assert_equals(new CSSUnparsedValue([
       new CSSVariableReferenceValue('--A',
-        new CSSUnparsedValue(new CSSVariableReferenceValue('--B'))),
-      new CSSVariableReferenceValue('--C')).toString(),
+        new CSSUnparsedValue([new CSSVariableReferenceValue('--B')])),
+      new CSSVariableReferenceValue('--C')]).toString(),
     'var(--A,var(--B))var(--C)');
 }, 'CSSUnparsedValue containing variable references serializes its ' +
    'concatenated contents');
 
 test(() => {
-  assert_equals(new CSSUnparsedValue('foo', 'bar ',
+  assert_equals(new CSSUnparsedValue(['foo', 'bar ',
       new CSSVariableReferenceValue('--A',
-        new CSSUnparsedValue('baz ',
-          new CSSVariableReferenceValue('--B'), 'lemon')),
+        new CSSUnparsedValue(['baz ',
+          new CSSVariableReferenceValue('--B'), 'lemon'])),
       new CSSVariableReferenceValue('--C',
-        new CSSUnparsedValue('ade'))).toString(),
+        new CSSUnparsedValue(['ade']))]).toString(),
     'foobar var(--A,baz var(--B)lemon)var(--C,ade)');
 }, 'CSSUnparsedValue containing mix of strings and variable references ' +
    'serializes to its concatenated contents');

diff --git a/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html b/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html
@@ -37,7 +37,7 @@
 
 for (const {args, description} of gTestArguments) {
   test(() => {
-    const result = new CSSUnparsedValue(...args);
+    const result = new CSSUnparsedValue(args);
 
     assert_not_equals(result, null,
         'A CSSUnparsedValue should be created');

diff --git a/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html b/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html
@@ -22,15 +22,15 @@
 
 test(() => {
   const result = new CSSVariableReferenceValue('--foo',
-      new CSSUnparsedValue('lemon'));
+      new CSSUnparsedValue(['lemon']));
 
   assert_not_equals(result, null,
       'A CSSVariableReferenceValue should be created');
   assert_equals(result.variable, '--foo',
       'Variable member should be same as passed in the constructor');
   assert_not_equals(result.fallback, null,
       'Fallback member should not be null');
-  assert_style_value_equals(result.fallback, new CSSUnparsedValue('lemon'),
+  assert_style_value_equals(result.fallback, new CSSUnparsedValue(['lemon']),
       'Fallback member should be as same as passed in the constructor');
 }, 'CSSVariableReferenceValue can be constructed with fallback');
 

diff --git a/css/css-typed-om/the-stylepropertymap/computed/computed.tentative.html b/css/css-typed-om/the-stylepropertymap/computed/computed.tentative.html
@@ -38,7 +38,7 @@
 
 test(() => {
   const result = styleMap.get('--foo');
-  assert_style_value_equals(result, new CSSUnparsedValue(' auto'));
+  assert_style_value_equals(result, new CSSUnparsedValue([' auto']));
 }, 'Computed StylePropertyMap contains custom property declarations in style rules');
 
 test(() => {
@@ -48,7 +48,7 @@
 
 test(() => {
   const result = styleMap.get('--bar');
-  assert_style_value_equals(result, new CSSUnparsedValue(' 5'));
+  assert_style_value_equals(result, new CSSUnparsedValue([' 5']));
 }, 'Computed StylePropertyMap contains custom property declarations in inline rules');
 
 test(() => {

diff --git a/css/css-typed-om/the-stylepropertymap/computed/get.html b/css/css-typed-om/the-stylepropertymap/computed/get.html
@@ -24,7 +24,7 @@
 test(t => {
   const styleMap = createComputedStyleMap(t, '--foo: auto; --bar: 10px');
   assert_style_value_equals(styleMap.get('--foo'),
-      new CSSUnparsedValue(' auto'));
+      new CSSUnparsedValue([' auto']));
 }, 'Getting a valid custom property from computed style returns the ' +
    'correct entry');
 

diff --git a/css/css-typed-om/the-stylepropertymap/computed/getAll.tentative.html b/css/css-typed-om/the-stylepropertymap/computed/getAll.tentative.html
@@ -31,7 +31,7 @@
 
 test(t => {
   const styleMap = createComputedStyleMap(t, '--foo: auto; --bar: 10px');
-  assert_style_value_array_equals(styleMap.getAll('--foo'), [new CSSUnparsedValue(' auto')]);
+  assert_style_value_array_equals(styleMap.getAll('--foo'), [new CSSUnparsedValue([' auto'])]);
 }, 'Calling StylePropertyMap.getAll with a valid custom property returns a single element list with the correct entry');
 
 test(t => {

diff --git a/css/css-typed-om/the-stylepropertymap/computed/iterable.tentative.html b/css/css-typed-om/the-stylepropertymap/computed/iterable.tentative.html
@@ -34,9 +34,9 @@
 
 test(t => {
   const styleMap = createComputedStyleMap(t, '--A: A; --C: C; color: red; --B: B;');
-  assert_style_value_equals(findInStyleMap(styleMap, '--A'), new CSSUnparsedValue(' A'));
-  assert_style_value_equals(findInStyleMap(styleMap, '--B'), new CSSUnparsedValue(' B'));
-  assert_style_value_equals(findInStyleMap(styleMap, '--C'), new CSSUnparsedValue(' C'));
+  assert_style_value_equals(findInStyleMap(styleMap, '--A'), new CSSUnparsedValue([' A']));
+  assert_style_value_equals(findInStyleMap(styleMap, '--B'), new CSSUnparsedValue([' B']));
+  assert_style_value_equals(findInStyleMap(styleMap, '--C'), new CSSUnparsedValue([' C']));
 }, 'StylePropertyMap iterator returns custom properties with the correct CSSStyleValue');
 
 </script>
diff --git a/css/css-typed-om/the-stylepropertymap/declared/declared.tentative.html b/css/css-typed-om/the-stylepropertymap/declared/declared.tentative.html
@@ -45,7 +45,7 @@
 }, 'Declared StylePropertyMap does not contain inline styles');
 
 test(() => {
-  assert_style_value_equals(styleMap.get('--foo'), new CSSUnparsedValue(' auto'));
+  assert_style_value_equals(styleMap.get('--foo'), new CSSUnparsedValue([' auto']));
 }, 'Declared StylePropertyMap contains custom property declarations');
 
 test(() => {

diff --git a/css/css-typed-om/the-stylepropertymap/declared/get.html b/css/css-typed-om/the-stylepropertymap/declared/get.html
@@ -29,7 +29,7 @@
 test(t => {
   const styleMap = createDeclaredStyleMap(t, '--foo: auto; --bar: 10px');
   assert_style_value_equals(styleMap.get('--foo'),
-      new CSSUnparsedValue(' auto'));
+      new CSSUnparsedValue([' auto']));
 }, 'Getting a valid custom property from CSS rule returns the ' +
    'correct entry');
 

diff --git a/css/css-typed-om/the-stylepropertymap/declared/getAll.tentative.html b/css/css-typed-om/the-stylepropertymap/declared/getAll.tentative.html
@@ -36,7 +36,7 @@
 
 test(t => {
   const styleMap = createDeclaredStyleMap(t, '--foo: auto; --bar: 10px');
-  assert_style_value_array_equals(styleMap.getAll('--foo'), [new CSSUnparsedValue(' auto')]);
+  assert_style_value_array_equals(styleMap.getAll('--foo'), [new CSSUnparsedValue([' auto'])]);
 }, 'Calling StylePropertyMap.getAll with a valid custom property returns a single element list with the correct entry');
 
 test(t => {

diff --git a/css/css-typed-om/the-stylepropertymap/declared/iterable.tentative.html b/css/css-typed-om/the-stylepropertymap/declared/iterable.tentative.html
@@ -42,9 +42,9 @@
 
   assert_array_equals(keys, ['--A', '--B', '--C']);
   assert_style_value_array_equals(values, [
-    new CSSUnparsedValue(' A'),
-    new CSSUnparsedValue(' B'),
-    new CSSUnparsedValue(' C'),
+    new CSSUnparsedValue([' A']),
+    new CSSUnparsedValue([' B']),
+    new CSSUnparsedValue([' C']),
   ])
 }, 'StylePropertyMap iterator returns custom properties with the correct CSSStyleValue');
 

diff --git a/css/css-typed-om/the-stylepropertymap/declared/set.tentative.html b/css/css-typed-om/the-stylepropertymap/declared/set.tentative.html
@@ -63,11 +63,11 @@
 test(t => {
   let styleMap = createDeclaredStyleMap(t, '');
 
-  styleMap.set('--foo', new CSSUnparsedValue('auto'));
-  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue('auto'));
+  styleMap.set('--foo', new CSSUnparsedValue(['auto']));
+  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue(['auto']));
 
   styleMap.set('--foo', '20px');
-  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue('20px'));
+  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue(['20px']));
 }, 'Setting a custom property with CSSStyleValue or String updates its value');
 
 test(t => {

diff --git a/css/css-typed-om/the-stylepropertymap/declared/update.tentative.html b/css/css-typed-om/the-stylepropertymap/declared/update.tentative.html
@@ -46,11 +46,11 @@
 test(t => {
   let styleMap = createDeclaredStyleMap(t, '');
 
-  styleMap.update('--foo', () => new CSSUnparsedValue('auto'));
-  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue('auto'));
+  styleMap.update('--foo', () => new CSSUnparsedValue(['auto']));
+  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue(['auto']));
 
-  styleMap.update('--foo', () => new CSSUnparsedValue('20px'));
-  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue('20px'));
+  styleMap.update('--foo', () => new CSSUnparsedValue(['20px']));
+  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue(['20px']));
 }, 'Updating a custom property with CSSStyleValue updates its value');
 
 test(t => {

diff --git a/css/css-typed-om/the-stylepropertymap/inline/get.html b/css/css-typed-om/the-stylepropertymap/inline/get.html
@@ -29,7 +29,7 @@
 test(t => {
   const styleMap = createInlineStyleMap(t, '--foo: auto; --bar: 10px');
   assert_style_value_equals(styleMap.get('--foo'),
-      new CSSUnparsedValue(' auto'));
+      new CSSUnparsedValue([' auto']));
 }, 'Getting a valid custom property from inline style returns the ' +
    'correct entry');
 

diff --git a/css/css-typed-om/the-stylepropertymap/inline/getAll.tentative.html b/css/css-typed-om/the-stylepropertymap/inline/getAll.tentative.html
@@ -36,7 +36,7 @@
 
 test(t => {
   const styleMap = createInlineStyleMap(t, '--foo: auto; --bar: 10px');
-  assert_style_value_array_equals(styleMap.getAll('--foo'), [new CSSUnparsedValue(' auto')]);
+  assert_style_value_array_equals(styleMap.getAll('--foo'), [new CSSUnparsedValue([' auto'])]);
 }, 'Calling StylePropertyMap.getAll with a valid custom property returns a single element list with the correct entry');
 
 test(t => {

diff --git a/css/css-typed-om/the-stylepropertymap/inline/iterable.tentative.html b/css/css-typed-om/the-stylepropertymap/inline/iterable.tentative.html
@@ -42,9 +42,9 @@
 
   assert_array_equals(keys, ['--A', '--B', '--C']);
   assert_style_value_array_equals(values, [
-    new CSSUnparsedValue(' A'),
-    new CSSUnparsedValue(' B'),
-    new CSSUnparsedValue(' C'),
+    new CSSUnparsedValue([' A']),
+    new CSSUnparsedValue([' B']),
+    new CSSUnparsedValue([' C']),
   ])
 }, 'StylePropertyMap iterator returns custom properties with the correct CSSStyleValue');
 

diff --git a/css/css-typed-om/the-stylepropertymap/inline/set.tentative.html b/css/css-typed-om/the-stylepropertymap/inline/set.tentative.html
@@ -63,11 +63,11 @@
 test(t => {
   let styleMap = createInlineStyleMap(t, '');
 
-  styleMap.set('--foo', new CSSUnparsedValue('auto'));
-  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue('auto'));
+  styleMap.set('--foo', new CSSUnparsedValue(['auto']));
+  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue(['auto']));
 
   styleMap.set('--foo', '20px');
-  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue('20px'));
+  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue(['20px']));
 }, 'Setting a custom property with CSSStyleValue or String updates its value');
 
 test(t => {

diff --git a/css/css-typed-om/the-stylepropertymap/inline/update.tentative.html b/css/css-typed-om/the-stylepropertymap/inline/update.tentative.html
@@ -46,11 +46,11 @@
 test(t => {
   let styleMap = createInlineStyleMap(t, '');
 
-  styleMap.update('--foo', () => new CSSUnparsedValue('auto'));
-  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue('auto'));
+  styleMap.update('--foo', () => new CSSUnparsedValue(['auto']));
+  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue(['auto']));
 
-  styleMap.update('--foo', () => new CSSUnparsedValue('20px'));
-  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue('20px'));
+  styleMap.update('--foo', () => new CSSUnparsedValue(['20px']));
+  assert_style_value_array_equals(styleMap.get('--foo'), new CSSUnparsedValue(['20px']));
 }, 'Updating a custom property with CSSStyleValue updates its value');
 
 test(t => {