Origin isolation: remove originIsolationRestricted alias

Fixed: 1103866 Change-Id: Id72de11128df96f28895460ae468ca7307c84e9f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367740Reviewed-by: Nate Chapin <japhet@chromium.org> Reviewed-by: James MacLean <wjmaclean@chromium.org> Commit-Queue: Domenic Denicola <domenic@chromium.org> Cr-Commit-Position: refs/heads/master@{#803876}

Origin isolation: remove originIsolationRestricted alias
Fixed: 1103866 Change-Id: Id72de11128df96f28895460ae468ca7307c84e9f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367740Reviewed-by: Nate Chapin <japhet@chromium.org> Reviewed-by: James MacLean <wjmaclean@chromium.org> Commit-Queue: Domenic Denicola <domenic@chromium.org> Cr-Commit-Position: refs/heads/master@{#803876}
8c8dcd60 · Domenic Denicola · Commit Bot · 52be4945 · 8c8dcd60 · 8c8dcd60
Commit 8c8dcd60 authored Sep 02, 2020 by Domenic Denicola Committed by Commit Bot Sep 02, 2020
7 changed files
--- a/third_party/blink/renderer/core/frame/window.idl
+++ b/third_party/blink/renderer/core/frame/window.idl
@@ -73,12 +73,9 @@
    [Custom, NotEnumerable, CrossOrigin] getter object (DOMString name);
    // the user agent
-    // includes an older version of originIsolated (originIsolationRestricted) to avoid breakage during origin trial
-    // TODO(https://crbug.com/1103866): remove the originIsolationRestricted alias before shipping
    [Affects=Nothing, LogActivity=GetterOnly] readonly attribute Navigator navigator;
    [LogActivity=GetterOnly, SecureContext, RuntimeEnabled=AppCache] readonly attribute ApplicationCache applicationCache;
    [RuntimeEnabled=OriginIsolationHeader] readonly attribute boolean originIsolated;
-    [RuntimeEnabled=OriginIsolationHeader, ImplementedAs=originIsolated] readonly attribute boolean originIsolationRestricted;
    // user prompts
    [Measure, CallWith=ScriptState] void alert();

--- a/third_party/blink/web_tests/fast/dom/Window/property-access-on-cached-window-after-frame-navigated-expected.txt
+++ b/third_party/blink/web_tests/fast/dom/Window/property-access-on-cached-window-after-frame-navigated-expected.txt
@@ -190,7 +190,6 @@ PASS oldChildWindow.onwheel is newChildWindow.onwheel
 PASS oldChildWindow.opener is newChildWindow.opener
 PASS oldChildWindow.origin is newChildWindow.origin
 PASS oldChildWindow.originIsolated is newChildWindow.originIsolated
-PASS oldChildWindow.originIsolationRestricted is newChildWindow.originIsolationRestricted
 PASS oldChildWindow.outerHeight is newChildWindow.outerHeight
 PASS oldChildWindow.outerWidth is newChildWindow.outerWidth
 PASS oldChildWindow.pageXOffset is newChildWindow.pageXOffset

--- a/third_party/blink/web_tests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-and-gced-expected.txt
+++ b/third_party/blink/web_tests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-and-gced-expected.txt
@@ -155,7 +155,6 @@ PASS childWindow.onwheel is null
 PASS childWindow.opener is null
 PASS childWindow.origin is 'file://'
 PASS childWindow.originIsolated is false
-PASS childWindow.originIsolationRestricted is false
 PASS childWindow.outerHeight is 0
 PASS childWindow.outerWidth is 0
 PASS childWindow.pageXOffset is 0

--- a/third_party/blink/web_tests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-expected.txt
+++ b/third_party/blink/web_tests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-expected.txt
@@ -155,7 +155,6 @@ PASS childWindow.onwheel is null
 PASS childWindow.opener is null
 PASS childWindow.origin is 'file://'
 PASS childWindow.originIsolated is false
-PASS childWindow.originIsolationRestricted is false
 PASS childWindow.outerHeight is 0
 PASS childWindow.outerWidth is 0
 PASS childWindow.pageXOffset is 0

--- a/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt
+++ b/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt
@@ -11949,7 +11949,6 @@ interface webkitURL
    getter opener
    getter origin
    getter originIsolated
-    getter originIsolationRestricted
    getter originPolicyIds
    getter outerHeight
    getter outerWidth

--- a/third_party/blink/web_tests/wpt_internal/origin-isolation/otoi-old-getter-exists.https.html
+++ b/third_party/blink/web_tests/wpt_internal/origin-isolation/otoi-old-getter-exists.https.html
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>The legacy originIsolationRestricted getter still exists for now</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<!--
-We're keeping originIsolationRestricted as an alias to originIsolated for
-the duration of the origin trial, to avoid breaking any code that depends on it.
-This test can be deleted when we finish off https://crbug.com/1103866 by
-removing the alias.
-->
-<script type="module">
-test(() => {
-  assert_equals(window.originIsolationRestricted, window.originIsolated,
-    "legacy getter value must equal the new getter value");
-  assert_equals(window.originIsolationRestricted, true,
-    "the getters must return true for this very simple isolation case");
-});
-</script>
--- a/third_party/blink/web_tests/wpt_internal/origin-isolation/otoi-old-getter-exists.https.html.headers
+++ b/third_party/blink/web_tests/wpt_internal/origin-isolation/otoi-old-getter-exists.https.html.headers
-Origin-Trial: AkwBfk9Djiu2sKAuVhMLUQ3ldCM8nF0QD6eQpx7wWSnmhMs7udZelhv2iJfIjYuj5j77L3htLCv/dAuv/ttfUQEAAABmeyJvcmlnaW4iOiAiaHR0cHM6Ly93ZWItcGxhdGZvcm0udGVzdDo4NDQ0IiwgImZlYXR1cmUiOiAiT3JpZ2luSXNvbGF0aW9uSGVhZGVyIiwgImV4cGlyeSI6IDIwMDAwMDAwMDB9
-Origin-Isolation: ?1