[css-typed-om] Allow mutations of CSSUnparsedValue.

This patch allows CSSUnparsedValue items to be mutated/appended. See https://github.com/w3c/css-houdini-drafts/issues/664 Bug: 812919 Change-Id: I3e3c1d91fa9bfaa3a1a4adde45202c36c9bdb37f Reviewed-on: https://chromium-review.googlesource.com/923670Reviewed-by: nainar <nainar@chromium.org> Commit-Queue: Darren Shen <shend@chromium.org> Cr-Commit-Position: refs/heads/master@{#537691}

[css-typed-om] Allow mutations of CSSUnparsedValue.
This patch allows CSSUnparsedValue items to be mutated/appended. See https://github.com/w3c/css-houdini-drafts/issues/664 Bug: 812919 Change-Id: I3e3c1d91fa9bfaa3a1a4adde45202c36c9bdb37f Reviewed-on: https://chromium-review.googlesource.com/923670Reviewed-by: nainar <nainar@chromium.org> Commit-Queue: Darren Shen <shend@chromium.org> Cr-Commit-Position: refs/heads/master@{#537691}
138fde45 · Darren Shen · Commit Bot · b7086194 · 138fde45 · 138fde45
Commit 138fde45 authored Feb 19, 2018 by Darren Shen Committed by Commit Bot Feb 19, 2018
4 changed files
--- a/third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html
@@ -5,6 +5,7 @@
 <meta name="assert" content="Test CSSUnparsedValue constructor and members">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="../resources/testhelper.js"></script>
 <body>
 <div id="log">
 <script>
@@ -47,4 +48,44 @@ for (const {args, description} of gTestArguments) {
  }, 'CSSUnparsedValue can be constructed from ' + description);
 }

+test(() => {
+  let result = new CSSUnparsedValue([new CSSVariableReferenceValue('--foo')]);
+
+  result[0] = 'A';
+  assert_equals(result[0], 'A', 'Item should be updated to new value');
+}, 'Can update item in CSSUnparsedValue to a string');
+
+test(() => {
+  let result = new CSSUnparsedValue(['foo']);
+
+  result[0] = new CSSVariableReferenceValue('--A');
+  assert_style_value_equals(result[0], new CSSVariableReferenceValue('--A'),
+      'Item should be updated to new value');
+}, 'Can update item in CSSUnparsedValue to a variable reference');
+
+test(() => {
+  let result = new CSSUnparsedValue([]);
+
+  result[0] = new CSSVariableReferenceValue('--A');
+  assert_equals(result.length, 1,
+      'Length of CSSUnparsedValue should have increased');
+  assert_style_value_equals(result[0], new CSSVariableReferenceValue('--A'),
+      'New item should be appended');
+
+  result[1] = 'foo';
+  assert_equals(result.length, 2,
+      'Length of CSSUnparsedValue should have increased');
+  assert_equals(result[1], 'foo', 'New item should be appended');
+}, 'Can append items to CSSUnparsedValue');
+
+test(() => {
+  const result = new CSSUnparsedValue(['foo', 'bar']);
+  assert_equals(result[3], undefined);
+}, 'Getting invalid index in CSSUnparsedValue returns undefined');
+
+test(() => {
+  let result = new CSSUnparsedValue(['foo', 'bar']);
+  assert_throws(new RangeError(), () => result[3] = 'foo');
+}, 'Setting invalid index in CSSUnparsedValue throws RangeError');
+
 </script>
--- a/third_party/WebKit/Source/core/css/cssom/CSSUnparsedValue.cpp
+++ b/third_party/WebKit/Source/core/css/cssom/CSSUnparsedValue.cpp
@@ -73,6 +73,34 @@ CSSUnparsedValue* CSSUnparsedValue::FromCSSValue(const CSSVariableData& value) {
  return CSSUnparsedValue::Create(ParserTokenRangeToTokens(value.TokenRange()));
 }

+CSSUnparsedSegment CSSUnparsedValue::AnonymousIndexedGetter(
+    unsigned index,
+    ExceptionState& exception_state) {
+  if (index < tokens_.size())
+    return tokens_[index];
+  return {};
+}
+
+bool CSSUnparsedValue::AnonymousIndexedSetter(unsigned index,
+                                              const CSSUnparsedSegment& segment,
+                                              ExceptionState& exception_state) {
+  if (index < tokens_.size()) {
+    tokens_[index] = segment;
+    return true;
+  }
+
+  if (index == tokens_.size()) {
+    tokens_.push_back(segment);
+    return true;
+  }
+
+  exception_state.ThrowRangeError(
+      ExceptionMessages::IndexOutsideRange<unsigned>(
+          "index", index, 0, ExceptionMessages::kInclusiveBound, tokens_.size(),
+          ExceptionMessages::kInclusiveBound));
+  return false;
+}
+
 const CSSValue* CSSUnparsedValue::ToCSSValue() const {
  if (tokens_.IsEmpty()) {
    return CSSVariableReferenceValue::Create(CSSVariableData::Create());

--- a/third_party/WebKit/Source/core/css/cssom/CSSUnparsedValue.h
+++ b/third_party/WebKit/Source/core/css/cssom/CSSUnparsedValue.h
@@ -36,13 +36,10 @@ class CORE_EXPORT CSSUnparsedValue final : public CSSStyleValue {

  StyleValueType GetType() const override { return kUnparsedType; }

-  CSSUnparsedSegment AnonymousIndexedGetter(
-      unsigned index,
-      ExceptionState& exception_state) const {
-    if (index < tokens_.size())
-      return tokens_[index];
-    return {};
-  }
+  CSSUnparsedSegment AnonymousIndexedGetter(unsigned, ExceptionState&);
+  bool AnonymousIndexedSetter(unsigned,
+                              const CSSUnparsedSegment&,
+                              ExceptionState&);

  size_t length() const { return tokens_.size(); }


--- a/third_party/WebKit/Source/core/css/cssom/CSSUnparsedValue.idl
+++ b/third_party/WebKit/Source/core/css/cssom/CSSUnparsedValue.idl
@@ -13,6 +13,7 @@
    iterable<CSSUnparsedSegment>;
    readonly attribute unsigned long length;
    [RaisesException] getter CSSUnparsedSegment (unsigned long index);
+    [RaisesException] setter CSSUnparsedSegment (unsigned long index, CSSUnparsedSegment val);
 };

 typedef (DOMString or CSSVariableReferenceValue) CSSUnparsedSegment;