<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281848] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281848">281848</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-09-01 07:54:39 -0700 (Wed, 01 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/272607">r272607</a>) Removal of alert()/confirm() in third-party iframes breaks Salesforce
https://bugs.webkit.org/show_bug.cgi?id=229737
<rdar://82591122>

Source/WebCore:

Unreviewed, Revert behavior change made in <a href="http://trac.webkit.org/projects/webkit/changeset/272607">r272607</a> as it broke Salesforce. My understanding is that
Chrome had to revert this too.

Tests: http/tests/security/cross-origin-js-prompt-allowed.html
       http/tests/security/same-origin-different-domain-js-prompt-allowed.html

* page/DOMWindow.cpp:
(WebCore::DOMWindow::alert):
(WebCore::DOMWindow::confirmForBindings):
(WebCore::DOMWindow::prompt):

LayoutTests:

Unreviewed, Update existing tests to reflect behavior change.

* http/tests/security/cross-origin-js-prompt-allowed-expected.txt: Added.
* http/tests/security/cross-origin-js-prompt-allowed.html: Renamed from LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden.html.
* http/tests/security/cross-origin-js-prompt-forbidden-expected.txt: Removed.
* http/tests/security/resources/cross-origin-js-prompt-allowed.html: Renamed from LayoutTests/http/tests/security/resources/cross-origin-js-prompt-forbidden.html.
* http/tests/security/same-origin-different-domain-js-prompt-allowed-expected.txt: Added.
* http/tests/security/same-origin-different-domain-js-prompt-allowed.html: Renamed from LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden.html.
* http/tests/security/same-origin-different-domain-js-prompt-forbidden-expected.txt: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestshistorycrossoriginreplacehistoryobjectchildexpectedtxt">trunk/LayoutTests/http/tests/history/cross-origin-replace-history-object-child-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginjspromptallowedexpectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-allowed-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginjspromptallowedhtml">trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-allowed.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityresourcescrossoriginjspromptallowedhtml">trunk/LayoutTests/http/tests/security/resources/cross-origin-js-prompt-allowed.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritysameorigindifferentdomainjspromptallowedexpectedtxt">trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-allowed-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritysameorigindifferentdomainjspromptallowedhtml">trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-allowed.html</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginjspromptforbiddenexpectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginjspromptforbiddenhtml">trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityresourcescrossoriginjspromptforbiddenhtml">trunk/LayoutTests/http/tests/security/resources/cross-origin-js-prompt-forbidden.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritysameorigindifferentdomainjspromptforbiddenexpectedtxt">trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritysameorigindifferentdomainjspromptforbiddenhtml">trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (281847 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-09-01 14:43:42 UTC (rev 281847)
+++ trunk/LayoutTests/ChangeLog 2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2021-09-01  Chris Dumez  <cdumez@apple.com>
+
+        Regression(r272607) Removal of alert()/confirm() in third-party iframes breaks Salesforce
+        https://bugs.webkit.org/show_bug.cgi?id=229737
+        <rdar://82591122>
+
+        Unreviewed, Update existing tests to reflect behavior change.
+
+        * http/tests/security/cross-origin-js-prompt-allowed-expected.txt: Added.
+        * http/tests/security/cross-origin-js-prompt-allowed.html: Renamed from LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden.html.
+        * http/tests/security/cross-origin-js-prompt-forbidden-expected.txt: Removed.
+        * http/tests/security/resources/cross-origin-js-prompt-allowed.html: Renamed from LayoutTests/http/tests/security/resources/cross-origin-js-prompt-forbidden.html.
+        * http/tests/security/same-origin-different-domain-js-prompt-allowed-expected.txt: Added.
+        * http/tests/security/same-origin-different-domain-js-prompt-allowed.html: Renamed from LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden.html.
+        * http/tests/security/same-origin-different-domain-js-prompt-forbidden-expected.txt: Removed.
+
</ins><span class="cx"> 2021-09-01  Myles C. Maxfield  <mmaxfield@apple.com>
</span><span class="cx"> 
</span><span class="cx">         CSSFontFaceSet.clear() should not clear CSS-connected members
</span></span></pre></div>
<a id="trunkLayoutTestshttptestshistorycrossoriginreplacehistoryobjectchildexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/history/cross-origin-replace-history-object-child-expected.txt (281847 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/history/cross-origin-replace-history-object-child-expected.txt      2021-09-01 14:43:42 UTC (rev 281847)
+++ trunk/LayoutTests/http/tests/history/cross-origin-replace-history-object-child-expected.txt 2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> CONSOLE MESSAGE: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match.
</span><span class="cx"> ALERT: Child window's history object before attempt to clear: undefined
</span><del>-CONSOLE MESSAGE: Use of window.alert is not allowed in different origin-domain iframes.
</del><ins>+ALERT: About to shadow child window's history object: [object History]
</ins><span class="cx"> CONSOLE MESSAGE: PASS: Could not shadow child window's history object: [object History]
</span><span class="cx"> CONSOLE MESSAGE: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match.
</span><span class="cx"> ALERT: Child window's history object after attempt to clear: undefined
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossoriginjspromptallowedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-allowed-expected.txt (0 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-allowed-expected.txt                                (rev 0)
+++ trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-allowed-expected.txt   2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+PROMPT: PASS: This prompt dialog should show, default text:
+CONFIRM: PASS: This confirm dialog should show
+ALERT: PASS: This alert dialog should show
+Tests that JS prompts are allowed in cross-origin frames
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossoriginjspromptallowedhtmlfromrev281847trunkLayoutTestshttptestssecuritycrossoriginjspromptforbiddenhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-allowed.html (from rev 281847, trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden.html) (0 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-allowed.html                                (rev 0)
+++ trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-allowed.html   2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="/js-test-resources/js-test.js"></script>
+<script>
+description("Tests that JS prompts are allowed in cross-origin frames");
+jsTestIsAsync = true;
+
+onmessage = (e) => {
+  if (e.data == "done")
+    finishJSTest();
+  else
+    debug(e.data);
+}
+</script>
+<iframe src="http://localhost:8000/security/resources/cross-origin-js-prompt-allowed.html"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossoriginjspromptforbiddenexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden-expected.txt (281847 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden-expected.txt      2021-09-01 14:43:42 UTC (rev 281847)
+++ trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden-expected.txt 2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-CONSOLE MESSAGE: Use of window.prompt is not allowed in different origin-domain iframes.
-CONSOLE MESSAGE: Use of window.confirm is not allowed in different origin-domain iframes.
-CONSOLE MESSAGE: Use of window.alert is not allowed in different origin-domain iframes.
-Tests that JS prompts are forbidden in cross-origin frames
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS: window.prompt() returned null
-PASS: window.confirm() returned false
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossoriginjspromptforbiddenhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden.html (281847 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden.html      2021-09-01 14:43:42 UTC (rev 281847)
+++ trunk/LayoutTests/http/tests/security/cross-origin-js-prompt-forbidden.html 2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<body>
-<script src="/js-test-resources/js-test.js"></script>
-<script>
-description("Tests that JS prompts are forbidden in cross-origin frames");
-jsTestIsAsync = true;
-
-onmessage = (e) => {
-  if (e.data == "done")
-    finishJSTest();
-  else
-    debug(e.data);
-}
-</script>
-<iframe src="http://localhost:8000/security/resources/cross-origin-js-prompt-forbidden.html"></iframe>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityresourcescrossoriginjspromptallowedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/resources/cross-origin-js-prompt-allowed.html (0 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/resources/cross-origin-js-prompt-allowed.html                              (rev 0)
+++ trunk/LayoutTests/http/tests/security/resources/cross-origin-js-prompt-allowed.html 2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script>
+onload = () => {
+    setTimeout(() => {
+        window.prompt("PASS: This prompt dialog should show");
+        window.confirm("PASS: This confirm dialog should show");
+        window.alert("PASS: This alert dialog should show");
+        top.postMessage("done", "*");
+    }, 0);
+};
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityresourcescrossoriginjspromptforbiddenhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/resources/cross-origin-js-prompt-forbidden.html (281847 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/resources/cross-origin-js-prompt-forbidden.html    2021-09-01 14:43:42 UTC (rev 281847)
+++ trunk/LayoutTests/http/tests/security/resources/cross-origin-js-prompt-forbidden.html       2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<body>
-<script>
-onload = () => {
-    setTimeout(() => {
-        let ret = window.prompt("FAIL: This prompt dialog should not show");
-        if (ret === null)
-            top.postMessage("PASS: window.prompt() returned null", "*");
-        else
-            top.postMessage("FAIL: window.prompt() did not return null", "*");
-        ret = window.confirm("FAIL: This confirm dialog should not show");
-        if (!ret)
-            top.postMessage("PASS: window.confirm() returned false", "*");
-        else
-            top.postMessage("FAIL: window.confirm() returned true", "*");
-        window.alert("FAIL: This alert dialog should not show");
-        top.postMessage("done", "*");
-    }, 0);
-};
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritysameorigindifferentdomainjspromptallowedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-allowed-expected.txt (0 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-allowed-expected.txt                                (rev 0)
+++ trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-allowed-expected.txt   2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+PROMPT: PASS: This prompt dialog should show, default text:
+CONFIRM: PASS: This confirm dialog should show
+ALERT: PASS: This alert dialog should show
+Tests that JS prompts are allowed in same-origin but different-domain iframes
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritysameorigindifferentdomainjspromptallowedhtmlfromrev281847trunkLayoutTestshttptestssecuritysameorigindifferentdomainjspromptforbiddenhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-allowed.html (from rev 281847, trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden.html) (0 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-allowed.html                                (rev 0)
+++ trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-allowed.html   2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="/js-test-resources/js-test.js"></script>
+<script>
+description("Tests that JS prompts are allowed in same-origin but different-domain iframes");
+jsTestIsAsync = true;
+
+if (window.internals)
+    window.internals.settings.setTreatIPAddressAsDomain(true);
+document.domain="0.0.1";
+
+onmessage = (e) => {
+  if (e.data == "done")
+    finishJSTest();
+  else
+    debug(e.data);
+}
+</script>
+<iframe src="http://127.0.0.1:8000/security/resources/cross-origin-js-prompt-allowed.html"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritysameorigindifferentdomainjspromptforbiddenexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden-expected.txt (281847 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden-expected.txt      2021-09-01 14:43:42 UTC (rev 281847)
+++ trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden-expected.txt 2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-CONSOLE MESSAGE: Use of window.prompt is not allowed in different origin-domain iframes.
-CONSOLE MESSAGE: Use of window.confirm is not allowed in different origin-domain iframes.
-CONSOLE MESSAGE: Use of window.alert is not allowed in different origin-domain iframes.
-Tests that JS prompts are forbidden in same-origin but different-domain iframes
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS: window.prompt() returned null
-PASS: window.confirm() returned false
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritysameorigindifferentdomainjspromptforbiddenhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden.html (281847 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden.html      2021-09-01 14:43:42 UTC (rev 281847)
+++ trunk/LayoutTests/http/tests/security/same-origin-different-domain-js-prompt-forbidden.html 2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<body>
-<script src="/js-test-resources/js-test.js"></script>
-<script>
-description("Tests that JS prompts are forbidden in same-origin but different-domain iframes");
-jsTestIsAsync = true;
-
-if (window.internals)
-    window.internals.settings.setTreatIPAddressAsDomain(true);
-document.domain="0.0.1";
-
-onmessage = (e) => {
-  if (e.data == "done")
-    finishJSTest();
-  else
-    debug(e.data);
-}
-</script>
-<iframe src="http://127.0.0.1:8000/security/resources/cross-origin-js-prompt-forbidden.html"></iframe>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281847 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-01 14:43:42 UTC (rev 281847)
+++ trunk/Source/WebCore/ChangeLog      2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-09-01  Chris Dumez  <cdumez@apple.com>
+
+        Regression(r272607) Removal of alert()/confirm() in third-party iframes breaks Salesforce
+        https://bugs.webkit.org/show_bug.cgi?id=229737
+        <rdar://82591122>
+
+        Unreviewed, Revert behavior change made in r272607 as it broke Salesforce. My understanding is that
+        Chrome had to revert this too.
+
+        Tests: http/tests/security/cross-origin-js-prompt-allowed.html
+               http/tests/security/same-origin-different-domain-js-prompt-allowed.html
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::alert):
+        (WebCore::DOMWindow::confirmForBindings):
+        (WebCore::DOMWindow::prompt):
+
</ins><span class="cx"> 2021-09-01  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         visualWordPosition should operate on a clean tree
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (281847 => 281848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp  2021-09-01 14:43:42 UTC (rev 281847)
+++ trunk/Source/WebCore/page/DOMWindow.cpp     2021-09-01 14:54:39 UTC (rev 281848)
</span><span class="lines">@@ -1117,11 +1117,6 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (!document->securityOrigin().isSameOriginDomain(document->topDocument().securityOrigin())) {
-        printErrorMessage("Use of window.alert is not allowed in different origin-domain iframes.");
-        return;
-    }
-
</del><span class="cx">     document->updateStyleIfNeeded();
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><span class="cx">     page->pointerLockController().requestPointerUnlock();
</span><span class="lines">@@ -1151,11 +1146,6 @@
</span><span class="cx">         return false;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (!document->securityOrigin().isSameOriginDomain(document->topDocument().securityOrigin())) {
-        printErrorMessage("Use of window.confirm is not allowed in different origin-domain iframes.");
-        return false;
-    }
-
</del><span class="cx">     document->updateStyleIfNeeded();
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><span class="cx">     page->pointerLockController().requestPointerUnlock();
</span><span class="lines">@@ -1185,11 +1175,6 @@
</span><span class="cx">         return String();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (!document->securityOrigin().isSameOriginDomain(document->topDocument().securityOrigin())) {
-        printErrorMessage("Use of window.prompt is not allowed in different origin-domain iframes.");
-        return String();
-    }
-
</del><span class="cx">     document->updateStyleIfNeeded();
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><span class="cx">     page->pointerLockController().requestPointerUnlock();
</span></span></pre>
</div>
</div>

</body>
</html>