1 files changed, 11 insertions, 21 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index b70663a6949..f5d408ad963 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -81,7 +81,6 @@ pub struct HTMLIFrameElement {
     sandbox_allowance: Cell<Option<SandboxAllowance>>,
     load_blocker: DomRefCell<Option<LoadBlocker>>,
     visibility: Cell<bool>,
-    name: DomRefCell<DOMString>,
 }
 
 impl HTMLIFrameElement {
@@ -265,7 +264,11 @@ impl HTMLIFrameElement {
         // when the iframe attributes are first processed.
         if mode == ProcessingMode::FirstTime {
             if let Some(window) = self.GetContentWindow() {
-                window.set_name(self.name.borrow().clone())
+                window.set_name(
+                    self.upcast::<Element>()
+                        .get_name()
+                        .map_or(DOMString::from(""), |n| DOMString::from(&*n)),
+                );
             }
         }
 
@@ -389,7 +392,6 @@ impl HTMLIFrameElement {
             sandbox_allowance: Cell::new(None),
             load_blocker: DomRefCell::new(None),
             visibility: Cell::new(true),
-            name: DomRefCell::new(DOMString::new()),
         }
     }
 
@@ -569,21 +571,14 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
     make_setter!(SetFrameBorder, "frameborder");
 
     // https://html.spec.whatwg.org/multipage/#dom-iframe-name
-    fn SetName(&self, name: DOMString) {
-        *self.name.borrow_mut() = name.clone();
-        if let Some(window) = self.GetContentWindow() {
-            window.set_name(name)
-        }
-    }
+    // A child browsing context checks the name of its iframe only at the time
+    // it is created; subsequent name sets have no special effect.
+    make_atomic_setter!(SetName, "name");
 
     // https://html.spec.whatwg.org/multipage/#dom-iframe-name
-    fn Name(&self) -> DOMString {
-        if let Some(window) = self.GetContentWindow() {
-            window.get_name()
-        } else {
-            self.name.borrow().clone()
-        }
-    }
+    // This is specified as reflecting the name content attribute of the
+    // element, not the name of the child browsing context.
+    make_getter!(Name, "name");
 }
 
 impl VirtualMethods for HTMLIFrameElement {
@@ -642,11 +637,6 @@ impl VirtualMethods for HTMLIFrameElement {
                     self.process_the_iframe_attributes(ProcessingMode::NotFirstTime);
                 }
             },
-            &local_name!("name") => {
-                let new_value = mutation.new_value(attr);
-                let value = new_value.as_ref().map_or("", |v| &v);
-                self.SetName(DOMString::from(value.to_owned()));
-            },
             _ => {},
         }
     }