diff --git a/‎lib/jsdom/browser/Window.js‎
Lines changed: 2 additions & 1 deletion b/‎lib/jsdom/browser/Window.js‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎lib/jsdom/living/helpers/document-base-url.js‎
Lines changed: 3 additions & 1 deletion b/‎lib/jsdom/living/helpers/document-base-url.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎lib/jsdom/living/nodes/Document-impl.js‎
Lines changed: 3 additions & 1 deletion b/‎lib/jsdom/living/nodes/Document-impl.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎lib/jsdom/living/nodes/HTMLFrameElement-impl.js‎
Lines changed: 2 additions & 1 deletion b/‎lib/jsdom/living/nodes/HTMLFrameElement-impl.js‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎test/web-platform-tests/to-upstream/html/semantics/embedded-content/the-iframe-element/bad-src-means-about-blank.html‎
Lines changed: 51 additions & 0 deletions b/‎test/web-platform-tests/to-upstream/html/semantics/embedded-content/the-iframe-element/bad-src-means-about-blank.html‎
Lines changed: 51 additions & 0 deletions
@@ -247,7 +247,8 @@ function Window(options) {
     concurrentNodeIterators: options.concurrentNodeIterators,
     parseOptions: options.parseOptions,
     defaultView: this._globalProxy,
-    global: this
+    global: this,
+    parentOrigin: options.parentOrigin
   }, { alwaysUseDocumentClass: true });
 
   if (vm.isContext(window)) {
 
@@ -1,5 +1,6 @@
 "use strict";
 const whatwgURL = require("whatwg-url");
+const { implForWrapper } = require("../generated/utils");
 
 exports.documentBaseURL = document => {
   // https://html.spec.whatwg.org/multipage/infrastructure.html#document-base-url
@@ -25,7 +26,8 @@ exports.fallbackBaseURL = document => {
 
   if (document.URL === "about:blank" && document._defaultView &&
       document._defaultView._parent !== document._defaultView) {
-    return exports.documentBaseURL(document._defaultView._parent._document);
+    const parentDocument = implForWrapper(document._defaultView._parent._document);
+    return exports.documentBaseURL(parentDocument);
   }
 
   return document._URL;
 
@@ -158,7 +158,9 @@ class DocumentImpl extends NodeImpl {
     }
 
     this._URL = parsed;
-    this._origin = whatwgURL.serializeURLOrigin(parsed);
+    this._origin = urlOption === "about:blank" && privateData.options.parentOrigin ?
+      privateData.options.parentOrigin :
+      whatwgURL.serializeURLOrigin(this._URL);
 
     this._location = Location.createImpl(this._globalObject, [], { relevantDocument: this });
     this._history = History.createImpl(this._globalObject, [], {
 
@@ -127,7 +127,8 @@ function loadFrame(frame, attaching) {
 
   const wnd = window.createWindow({
     parsingMode: "html",
-    url: url.scheme === "javascript" || serializedURL === "about:blank" ? parentDoc.URL : serializedURL,
+    url: url.scheme === "javascript" ? parentDoc.URL : serializedURL,
+    parentOrigin: parentDoc._origin,
     resourceLoader: parentDoc._defaultView._resourceLoader,
     referrer: parentDoc.URL,
     cookieJar: parentDoc._cookieJar,
 
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<title>location href in iframe when setting src attribute</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/history.html#the-location-interface">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+
+<script>
+"use strict";
+setup({ explicit_done: true });
+
+const tests = [
+  {
+    inputSrc: null,
+    expectedLocationHref: "about:blank"
+  },
+  {
+    inputSrc: "about:blank",
+    expectedLocationHref: "about:blank"
+  },
+  {
+    inputSrc: "",
+    expectedLocationHref: "about:blank"
+  },
+  {
+    inputSrc: "http://:80/invalid-url",
+    expectedLocationHref: "about:blank"
+  }
+];
+
+window.onload = () => {
+  for (const { inputSrc, expectedLocationHref } of tests) {
+    async_test(t => {
+      const iframe = document.createElement("iframe");
+
+      iframe.onload = t.step_func_done(() => {
+        assert_equals(iframe.contentWindow.location.href, expectedLocationHref);
+      });
+
+      if (inputSrc !== null) {
+        iframe.src = inputSrc;
+      }
+      document.body.append(iframe);
+    }, "Testing location href of iframe with input src: " + inputSrc);
+  }
+
+  done();
+};
+</script>
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,9 @@ class DocumentImpl extends NodeImpl {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`this._URL = parsed;`
`161`		`- this._origin = whatwgURL.serializeURLOrigin(parsed);`
	`161`	`+ this._origin = urlOption === "about:blank" && privateData.options.parentOrigin ?`
	`162`	`+ privateData.options.parentOrigin :`
	`163`	`+ whatwgURL.serializeURLOrigin(this._URL);`
`162`	`164`
`163`	`165`	`this._location = Location.createImpl(this._globalObject, [], { relevantDocument: this });`
`164`	`166`	`this._history = History.createImpl(this._globalObject, [], {`