Implement the HTMLScriptElement.src setter

Fixes #1113.
servo · Dec 5, 2014 · cddc692 · cddc692 · bors-servo · Dec 5, 2014
1 parent b8444f9
commit cddc692
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 85 deletions.
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
@@ -28,6 +28,7 @@ use encoding::types::{Encoding, DecodeReplace};
 use servo_net::resource_task::load_whole_resource;
 use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec};
 use std::cell::Cell;
+use string_cache::Atom;
 use url::UrlParser;
 
 #[dom_struct]
@@ -302,10 +303,9 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLScriptElement> {
 }
 
 impl<'a> HTMLScriptElementMethods for JSRef<'a, HTMLScriptElement> {
-    fn Src(self) -> DOMString {
-        let element: JSRef<Element> = ElementCast::from_ref(self);
-        element.get_url_attribute(&atom!("src"))
-    }
+    make_url_getter!(Src)
+
+    make_setter!(SetSrc, "src")
 
     // http://www.whatwg.org/html/#dom-script-text
     fn Text(self) -> DOMString {

diff --git a/components/script/dom/webidls/HTMLScriptElement.webidl b/components/script/dom/webidls/HTMLScriptElement.webidl
@@ -5,8 +5,7 @@
 
 // http://www.whatwg.org/html/#htmlscriptelement
 interface HTMLScriptElement : HTMLElement {
-  //         attribute DOMString src;
-  readonly attribute DOMString src;
+           attribute DOMString src;
   //         attribute DOMString type;
   //         attribute DOMString charset;
   //         attribute boolean async;

diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -6090,9 +6090,6 @@
   [HTMLScriptElement interface object length]
     expected: FAIL
 
-  [HTMLScriptElement interface: attribute src]
-    expected: FAIL
-
   [HTMLScriptElement interface: attribute type]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/html/dom/reflection-misc.html.ini b/tests/wpt/metadata/html/dom/reflection-misc.html.ini
@@ -1386,105 +1386,54 @@
   [script.src: setAttribute() to object "test-valueOf" followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to "" followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to "" followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to " foo " followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to " foo " followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to "http://site.example/" followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to "http://site.example/" followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to "//site.example/path???@#l" followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to "//site.example/path???@#l" followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to "\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f " followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to "\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f " followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to undefined followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to undefined followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to 7 followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to 7 followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to 1.5 followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to 1.5 followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to true followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to true followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to false followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to false followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to object "[object Object\]" followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to object "[object Object\]" followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to NaN followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to NaN followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to Infinity followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to Infinity followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to -Infinity followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to -Infinity followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to "\\0" followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to "\\0" followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to null followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to null followed by IDL get]
     expected: FAIL
 
-  [script.src: IDL set to object "test-toString" followed by getAttribute()]
-    expected: FAIL
-
   [script.src: IDL set to object "test-toString" followed by IDL get]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/095.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/095.html.ini
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/105.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/105.html.ini
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/123.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/123.html.ini
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/126.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/126.html.ini
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/146.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/146.html.ini