aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-06-05 12:23:20 -0500
committerbors-servo <lbergstrom+bors@mozilla.com>2016-06-05 12:23:20 -0500
commit44126da60e2494b5f59bee88833058ba1e66f811 (patch)
treec4db1d894c0e33b68e89801f7238377a39c1b1d5
parent93f137f06d36059105d62ffc6829d65f7efe0d9d (diff)
parenta121437f875c5034174acc70a54ff47e192bcfd5 (diff)
downloadservo-44126da60e2494b5f59bee88833058ba1e66f811.tar.gz
servo-44126da60e2494b5f59bee88833058ba1e66f811.zip
Auto merge of #11606 - kevgs:dom_settable_token_list, r=nox
Removed references to DOMSettableTokenList <!-- Please describe your changes on the following line: --> PR to #11578 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11606) <!-- Reviewable:end -->
-rw-r--r--components/script/dom/webidls/HTMLAnchorElement.webidl2
-rw-r--r--components/script/dom/webidls/HTMLAreaElement.webidl2
-rw-r--r--components/script/dom/webidls/HTMLElement.webidl5
-rw-r--r--components/script/dom/webidls/HTMLIFrameElement.webidl1
-rw-r--r--components/script/dom/webidls/HTMLLinkElement.webidl2
-rw-r--r--components/script/dom/webidls/HTMLOutputElement.webidl2
-rw-r--r--components/script/dom/webidls/HTMLTableCellElement.webidl2
-rw-r--r--tests/wpt/metadata/dom/interface-objects.html.ini3
8 files changed, 6 insertions, 13 deletions
diff --git a/components/script/dom/webidls/HTMLAnchorElement.webidl b/components/script/dom/webidls/HTMLAnchorElement.webidl
index ddfc155cc1f..f78d1dae6dd 100644
--- a/components/script/dom/webidls/HTMLAnchorElement.webidl
+++ b/components/script/dom/webidls/HTMLAnchorElement.webidl
@@ -14,7 +14,7 @@
interface HTMLAnchorElement : HTMLElement {
attribute DOMString target;
// attribute DOMString download;
- //[PutForwards=value] attribute DOMSettableTokenList ping;
+ // attribute USVString ping;
// attribute DOMString rel;
readonly attribute DOMTokenList relList;
// attribute DOMString hreflang;
diff --git a/components/script/dom/webidls/HTMLAreaElement.webidl b/components/script/dom/webidls/HTMLAreaElement.webidl
index 6f1a6891518..14883df3613 100644
--- a/components/script/dom/webidls/HTMLAreaElement.webidl
+++ b/components/script/dom/webidls/HTMLAreaElement.webidl
@@ -9,7 +9,7 @@ interface HTMLAreaElement : HTMLElement {
// attribute DOMString shape;
// attribute DOMString target;
// attribute DOMString download;
- //[PutForwards=value] attribute DOMSettableTokenList ping;
+ // attribute USVString ping;
// attribute DOMString rel;
readonly attribute DOMTokenList relList;
// hreflang and type are not reflected
diff --git a/components/script/dom/webidls/HTMLElement.webidl b/components/script/dom/webidls/HTMLElement.webidl
index 19222109d63..188c0421154 100644
--- a/components/script/dom/webidls/HTMLElement.webidl
+++ b/components/script/dom/webidls/HTMLElement.webidl
@@ -13,10 +13,7 @@ interface HTMLElement : Element {
// microdata
// attribute boolean itemScope;
- //[PutForwards=value] readonly attribute DOMSettableTokenList itemType;
// attribute DOMString itemId;
- //[PutForwards=value] readonly attribute DOMSettableTokenList itemRef;
- //[PutForwards=value] readonly attribute DOMSettableTokenList itemProp;
//readonly attribute HTMLPropertiesCollection properties;
// attribute any itemValue; // acts as DOMString on setting
@@ -29,7 +26,7 @@ interface HTMLElement : Element {
// attribute DOMString accessKey;
//readonly attribute DOMString accessKeyLabel;
// attribute boolean draggable;
- //[PutForwards=value] readonly attribute DOMSettableTokenList dropzone;
+ //[SameObject, PutForwards=value] readonly attribute DOMTokenList dropzone;
// attribute HTMLMenuElement? contextMenu;
// attribute boolean spellcheck;
//void forceSpellCheck();
diff --git a/components/script/dom/webidls/HTMLIFrameElement.webidl b/components/script/dom/webidls/HTMLIFrameElement.webidl
index 0d78b56fb98..65ccbe84048 100644
--- a/components/script/dom/webidls/HTMLIFrameElement.webidl
+++ b/components/script/dom/webidls/HTMLIFrameElement.webidl
@@ -7,7 +7,6 @@ interface HTMLIFrameElement : HTMLElement {
attribute DOMString src;
// attribute DOMString srcdoc;
// attribute DOMString name;
- //[PutForwards=value] readonly attribute DOMSettableTokenList sandbox;
attribute DOMString sandbox;
// attribute boolean seamless;
// attribute boolean allowFullscreen;
diff --git a/components/script/dom/webidls/HTMLLinkElement.webidl b/components/script/dom/webidls/HTMLLinkElement.webidl
index 1bcf2e727f2..8c1bf496590 100644
--- a/components/script/dom/webidls/HTMLLinkElement.webidl
+++ b/components/script/dom/webidls/HTMLLinkElement.webidl
@@ -11,7 +11,7 @@ interface HTMLLinkElement : HTMLElement {
attribute DOMString media;
attribute DOMString hreflang;
attribute DOMString type;
- //[PutForwards=value] readonly attribute DOMSettableTokenList sizes;
+ // [SameObject, PutForwards=value] readonly attribute DOMTokenList sizes;
// also has obsolete members
};
diff --git a/components/script/dom/webidls/HTMLOutputElement.webidl b/components/script/dom/webidls/HTMLOutputElement.webidl
index 9506d56df65..f0baeb8fa03 100644
--- a/components/script/dom/webidls/HTMLOutputElement.webidl
+++ b/components/script/dom/webidls/HTMLOutputElement.webidl
@@ -4,7 +4,7 @@
// https://html.spec.whatwg.org/multipage/#htmloutputelement
interface HTMLOutputElement : HTMLElement {
- //[PutForwards=value] readonly attribute DOMSettableTokenList htmlFor;
+ // [SameObject, PutForwards=value] readonly attribute DOMTokenList htmlFor;
readonly attribute HTMLFormElement? form;
// attribute DOMString name;
diff --git a/components/script/dom/webidls/HTMLTableCellElement.webidl b/components/script/dom/webidls/HTMLTableCellElement.webidl
index bbb04109d09..33863b3dc20 100644
--- a/components/script/dom/webidls/HTMLTableCellElement.webidl
+++ b/components/script/dom/webidls/HTMLTableCellElement.webidl
@@ -7,7 +7,7 @@
interface HTMLTableCellElement : HTMLElement {
attribute unsigned long colSpan;
// attribute unsigned long rowSpan;
- //[PutForwards=value] readonly attribute DOMSettableTokenList headers;
+ // attribute DOMString headers;
readonly attribute long cellIndex;
// also has obsolete members
diff --git a/tests/wpt/metadata/dom/interface-objects.html.ini b/tests/wpt/metadata/dom/interface-objects.html.ini
index 5cf7f22718e..98c8c959837 100644
--- a/tests/wpt/metadata/dom/interface-objects.html.ini
+++ b/tests/wpt/metadata/dom/interface-objects.html.ini
@@ -3,6 +3,3 @@
[Should be able to delete DOMStringList.]
expected: FAIL
- [Should be able to delete DOMSettableTokenList.]
- expected: FAIL
-