Document::addressSpace shouldn't crash when used in a detached Document

Bug: 1083485 Test: fast/frames/document-addressSpace-in-initial-document-after-navigation.html Change-Id: I08229cb5143e3a348d0897d4ad186978a858b7b0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2215443Reviewed-by: Kentaro Hara <haraken@chromium.org> Commit-Queue: Nate Chapin <japhet@chromium.org> Cr-Commit-Position: refs/heads/master@{#772270}

Document::addressSpace shouldn't crash when used in a detached Document
Bug: 1083485 Test: fast/frames/document-addressSpace-in-initial-document-after-navigation.html Change-Id: I08229cb5143e3a348d0897d4ad186978a858b7b0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2215443Reviewed-by: Kentaro Hara <haraken@chromium.org> Commit-Queue: Nate Chapin <japhet@chromium.org> Cr-Commit-Position: refs/heads/master@{#772270}
8c9a47fa · Nate Chapin · Commit Bot · ade0a3fa · 8c9a47fa · 8c9a47fa
Commit 8c9a47fa authored May 27, 2020 by Nate Chapin Committed by Commit Bot May 27, 2020
3 changed files
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -1125,7 +1125,7 @@ String Document::addressSpaceForBindings(ScriptState* script_state) const {
  // "public" is the lowest-privilege value.
  if (!script_state->ContextIsValid())
    return "public";
-  return GetExecutionContext()->addressSpaceForBindings();
+  return ExecutionContext::From(script_state)->addressSpaceForBindings();
 }

 void Document::ChildrenChanged(const ChildrenChange& change) {

--- a/third_party/blink/web_tests/fast/frames/document-addressSpace-in-initial-document-after-navigation-expected.txt
+++ b/third_party/blink/web_tests/fast/frames/document-addressSpace-in-initial-document-after-navigation-expected.txt
+PASS if no crash. 
--- a/third_party/blink/web_tests/fast/frames/document-addressSpace-in-initial-document-after-navigation.html
+++ b/third_party/blink/web_tests/fast/frames/document-addressSpace-in-initial-document-after-navigation.html
+<body>
+PASS if no crash.
+<iframe id="i" src="resources/fail-and-notify-done.html"></iframe>
+<script>
+if (window.testRunner)
+  testRunner.dumpAsText();
+
+var doc = i.contentDocument;
+i.src = "about:blank";
+doc.addressSpace;
+</script>
+</body>