<!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>[283411] branches/safari-612.2.9.3-branch</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/283411">283411</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-10-01 15:57:32 -0700 (Fri, 01 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/283410">r283410</a>. rdar://problem/83784775

    Disable new incumbent-window until it is fully implemented
    https://bugs.webkit.org/show_bug.cgi?id=230261
    <rdar://problem/83099726>

    Reviewed by Chris Dumez and Geoffrey Garen.

    LayoutTests/imported/w3c:

    * web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt:
    * web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent-expected.txt:

    Source/JavaScriptCore:

    * interpreter/CallFrame.cpp:
    (JSC::CallFrame::globalObjectOfClosestCodeBlock):
    * runtime/JSObject.cpp:
    (JSC::JSObject::getOwnPropertyDescriptor):
    * runtime/PropertySlot.h:

    Source/WebCore:

    This patch disables new incumbent-window until it is fully implemented to avoid compatibility issue.

    * bindings/js/JSDOMConvertCallbacks.h:
    (WebCore::Converter<IDLCallbackFunction<T>>::convert):
    (WebCore::Converter<IDLCallbackInterface<T>>::convert):
    * bindings/js/JSDOMGlobalObject.cpp:
    (WebCore::callerGlobalObject):
    (WebCore::legacyActiveGlobalObjectForAccessor):
    * bindings/js/JSDOMGlobalObject.h:
    * bindings/js/JSDOMWindowBase.cpp:
    (WebCore::incumbentDOMWindow):
    (WebCore::legacyActiveDOMWindowForAccessor):
    * bindings/js/JSDOMWindowBase.h:
    * bindings/scripts/CodeGeneratorJS.pm:
    (GetJSCAttributesForAttribute):
    (GenerateCallWith):
    * page/Location.idl:

    LayoutTests:

    * http/tests/security/frameNavigation/context-for-location-href-gopd-expected.txt:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283410 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612293branchLayoutTestsChangeLog">branches/safari-612.2.9.3-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari612293branchLayoutTestshttptestssecurityframeNavigationcontextforlocationhrefgopdexpectedtxt">branches/safari-612.2.9.3-branch/LayoutTests/http/tests/security/frameNavigation/context-for-location-href-gopd-expected.txt</a></li>
<li><a href="#branchessafari612293branchLayoutTestsimportedw3cChangeLog">branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#branchessafari612293branchLayoutTestsimportedw3cwebplatformtestshtmlwebappapisscriptingeventscompileeventhandlersettingsobjectsexpectedtxt">branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt</a></li>
<li><a href="#branchessafari612293branchLayoutTestsimportedw3cwebplatformtestshtmlwebappapisscriptingprocessingmodel2integrationwiththejavascriptjobqueuepromisejobincumbentexpectedtxt">branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent-expected.txt</a></li>
<li><a href="#branchessafari612293branchSourceJavaScriptCoreChangeLog">branches/safari-612.2.9.3-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari612293branchSourceJavaScriptCoreinterpreterCallFramecpp">branches/safari-612.2.9.3-branch/Source/JavaScriptCore/interpreter/CallFrame.cpp</a></li>
<li><a href="#branchessafari612293branchSourceJavaScriptCoreruntimeJSObjectcpp">branches/safari-612.2.9.3-branch/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#branchessafari612293branchSourceJavaScriptCoreruntimePropertySloth">branches/safari-612.2.9.3-branch/Source/JavaScriptCore/runtime/PropertySlot.h</a></li>
<li><a href="#branchessafari612293branchSourceWebCoreChangeLog">branches/safari-612.2.9.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari612293branchSourceWebCorebindingsjsJSDOMGlobalObjectcpp">branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp</a></li>
<li><a href="#branchessafari612293branchSourceWebCorebindingsjsJSDOMGlobalObjecth">branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMGlobalObject.h</a></li>
<li><a href="#branchessafari612293branchSourceWebCorebindingsjsJSDOMWindowBasecpp">branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
<li><a href="#branchessafari612293branchSourceWebCorebindingsjsJSDOMWindowBaseh">branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMWindowBase.h</a></li>
<li><a href="#branchessafari612293branchSourceWebCorebindingsscriptsCodeGeneratorJSpm">branches/safari-612.2.9.3-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#branchessafari612293branchSourceWebCorepageLocationidl">branches/safari-612.2.9.3-branch/Source/WebCore/page/Location.idl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612293branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/LayoutTests/ChangeLog (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/LayoutTests/ChangeLog   2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/LayoutTests/ChangeLog      2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2021-10-01  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r283410. rdar://problem/83784775
+
+    Disable new incumbent-window until it is fully implemented
+    https://bugs.webkit.org/show_bug.cgi?id=230261
+    <rdar://problem/83099726>
+    
+    Reviewed by Chris Dumez and Geoffrey Garen.
+    
+    LayoutTests/imported/w3c:
+    
+    * web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt:
+    * web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent-expected.txt:
+    
+    Source/JavaScriptCore:
+    
+    * interpreter/CallFrame.cpp:
+    (JSC::CallFrame::globalObjectOfClosestCodeBlock):
+    * runtime/JSObject.cpp:
+    (JSC::JSObject::getOwnPropertyDescriptor):
+    * runtime/PropertySlot.h:
+    
+    Source/WebCore:
+    
+    This patch disables new incumbent-window until it is fully implemented to avoid compatibility issue.
+    
+    * bindings/js/JSDOMConvertCallbacks.h:
+    (WebCore::Converter<IDLCallbackFunction<T>>::convert):
+    (WebCore::Converter<IDLCallbackInterface<T>>::convert):
+    * bindings/js/JSDOMGlobalObject.cpp:
+    (WebCore::callerGlobalObject):
+    (WebCore::legacyActiveGlobalObjectForAccessor):
+    * bindings/js/JSDOMGlobalObject.h:
+    * bindings/js/JSDOMWindowBase.cpp:
+    (WebCore::incumbentDOMWindow):
+    (WebCore::legacyActiveDOMWindowForAccessor):
+    * bindings/js/JSDOMWindowBase.h:
+    * bindings/scripts/CodeGeneratorJS.pm:
+    (GetJSCAttributesForAttribute):
+    (GenerateCallWith):
+    * page/Location.idl:
+    
+    LayoutTests:
+    
+    * http/tests/security/frameNavigation/context-for-location-href-gopd-expected.txt:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283410 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-01  Yusuke Suzuki  <ysuzuki@apple.com>
+
+            Disable new incumbent-window until it is fully implemented
+            https://bugs.webkit.org/show_bug.cgi?id=230261
+            <rdar://problem/83099726>
+
+            Reviewed by Chris Dumez and Geoffrey Garen.
+
+            * http/tests/security/frameNavigation/context-for-location-href-gopd-expected.txt:
+
</ins><span class="cx"> 2021-09-27  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r283035. rdar://problem/83584492
</span></span></pre></div>
<a id="branchessafari612293branchLayoutTestshttptestssecurityframeNavigationcontextforlocationhrefgopdexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/LayoutTests/http/tests/security/frameNavigation/context-for-location-href-gopd-expected.txt (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/LayoutTests/http/tests/security/frameNavigation/context-for-location-href-gopd-expected.txt     2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/LayoutTests/http/tests/security/frameNavigation/context-for-location-href-gopd-expected.txt        2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><del>-document.referrer = http://127.0.0.1:8000/security/frameNavigation/context-for-location-href-gopd.html
</del><ins>+document.referrer = http://127.0.0.1:8000/security/frameNavigation/resources/middle-frame-for-location.html
</ins><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari612293branchLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/ChangeLog (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/ChangeLog      2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/ChangeLog 2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -1,3 +1,63 @@
</span><ins>+2021-10-01  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r283410. rdar://problem/83784775
+
+    Disable new incumbent-window until it is fully implemented
+    https://bugs.webkit.org/show_bug.cgi?id=230261
+    <rdar://problem/83099726>
+    
+    Reviewed by Chris Dumez and Geoffrey Garen.
+    
+    LayoutTests/imported/w3c:
+    
+    * web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt:
+    * web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent-expected.txt:
+    
+    Source/JavaScriptCore:
+    
+    * interpreter/CallFrame.cpp:
+    (JSC::CallFrame::globalObjectOfClosestCodeBlock):
+    * runtime/JSObject.cpp:
+    (JSC::JSObject::getOwnPropertyDescriptor):
+    * runtime/PropertySlot.h:
+    
+    Source/WebCore:
+    
+    This patch disables new incumbent-window until it is fully implemented to avoid compatibility issue.
+    
+    * bindings/js/JSDOMConvertCallbacks.h:
+    (WebCore::Converter<IDLCallbackFunction<T>>::convert):
+    (WebCore::Converter<IDLCallbackInterface<T>>::convert):
+    * bindings/js/JSDOMGlobalObject.cpp:
+    (WebCore::callerGlobalObject):
+    (WebCore::legacyActiveGlobalObjectForAccessor):
+    * bindings/js/JSDOMGlobalObject.h:
+    * bindings/js/JSDOMWindowBase.cpp:
+    (WebCore::incumbentDOMWindow):
+    (WebCore::legacyActiveDOMWindowForAccessor):
+    * bindings/js/JSDOMWindowBase.h:
+    * bindings/scripts/CodeGeneratorJS.pm:
+    (GetJSCAttributesForAttribute):
+    (GenerateCallWith):
+    * page/Location.idl:
+    
+    LayoutTests:
+    
+    * http/tests/security/frameNavigation/context-for-location-href-gopd-expected.txt:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283410 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-01  Yusuke Suzuki  <ysuzuki@apple.com>
+
+            Disable new incumbent-window until it is fully implemented
+            https://bugs.webkit.org/show_bug.cgi?id=230261
+            <rdar://problem/83099726>
+
+            Reviewed by Chris Dumez and Geoffrey Garen.
+
+            * web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt:
+            * web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent-expected.txt:
+
</ins><span class="cx"> 2021-09-24  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r282084. rdar://problem/83429618
</span></span></pre></div>
<a id="branchessafari612293branchLayoutTestsimportedw3cwebplatformtestshtmlwebappapisscriptingeventscompileeventhandlersettingsobjectsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt        2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt   2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> 
</span><span class="cx"> PASS The Function instance must be created in the Realm of the node document
</span><span class="cx"> FAIL The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document assert_equals: expected "/html/webappapis/scripting/events/resources/open-window.html" but got "/html/webappapis/scripting/events/open-window.html"
</span><del>-PASS The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document
</del><ins>+FAIL The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document assert_equals: expected "iframe" but got "parent frame"
</ins><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari612293branchLayoutTestsimportedw3cwebplatformtestshtmlwebappapisscriptingprocessingmodel2integrationwiththejavascriptjobqueuepromisejobincumbentexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent-expected.txt (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent-expected.txt   2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/LayoutTests/imported/w3c/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent-expected.txt      2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -2,13 +2,13 @@
</span><span class="cx"> 
</span><span class="cx"> PASS Sanity check: this all works as expected with no promises involved
</span><span class="cx"> PASS Fulfillment handler on fulfilled promise
</span><del>-FAIL Fulfillment handler on fulfilled promise, using backup incumbent settings object stack assert_equals: expected "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html" but got "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent.html"
</del><ins>+FAIL Fulfillment handler on fulfilled promise, using backup incumbent settings object stack assert_equals: expected "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html" but got "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/current.html"
</ins><span class="cx"> PASS Rejection handler on rejected promise
</span><del>-FAIL Rejection handler on rejected promise, using backup incumbent settings object stack assert_equals: expected "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html" but got "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent.html"
</del><ins>+FAIL Rejection handler on rejected promise, using backup incumbent settings object stack assert_equals: expected "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html" but got "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/current.html"
</ins><span class="cx"> PASS Fulfillment handler on pending-then-fulfilled promise
</span><del>-FAIL Fulfillment handler on pending-then-fulfilled promise, using backup incumbent settings object stack assert_equals: expected "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html" but got "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent.html"
</del><ins>+FAIL Fulfillment handler on pending-then-fulfilled promise, using backup incumbent settings object stack assert_equals: expected "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html" but got "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/current.html"
</ins><span class="cx"> PASS Rejection handler on pending-then-rejected promise
</span><del>-FAIL Rejection handler on pending-then-rejected promise, using backup incumbent settings object stack assert_equals: expected "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html" but got "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent.html"
</del><ins>+FAIL Rejection handler on pending-then-rejected promise, using backup incumbent settings object stack assert_equals: expected "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html" but got "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/current.html"
</ins><span class="cx"> PASS Thenable resolution
</span><del>-FAIL Thenable resolution, using backup incumbent settings object stack assert_equals: expected "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html" but got "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent.html"
</del><ins>+FAIL Thenable resolution, using backup incumbent settings object stack assert_equals: expected "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/promise-job-incumbent-incumbent.html" but got "http://localhost:8800/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/resources/current/current.html"
</ins><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari612293branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/JavaScriptCore/ChangeLog (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/JavaScriptCore/ChangeLog 2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/JavaScriptCore/ChangeLog    2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2021-10-01  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r283410. rdar://problem/83784775
+
+    Disable new incumbent-window until it is fully implemented
+    https://bugs.webkit.org/show_bug.cgi?id=230261
+    <rdar://problem/83099726>
+    
+    Reviewed by Chris Dumez and Geoffrey Garen.
+    
+    LayoutTests/imported/w3c:
+    
+    * web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt:
+    * web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent-expected.txt:
+    
+    Source/JavaScriptCore:
+    
+    * interpreter/CallFrame.cpp:
+    (JSC::CallFrame::globalObjectOfClosestCodeBlock):
+    * runtime/JSObject.cpp:
+    (JSC::JSObject::getOwnPropertyDescriptor):
+    * runtime/PropertySlot.h:
+    
+    Source/WebCore:
+    
+    This patch disables new incumbent-window until it is fully implemented to avoid compatibility issue.
+    
+    * bindings/js/JSDOMConvertCallbacks.h:
+    (WebCore::Converter<IDLCallbackFunction<T>>::convert):
+    (WebCore::Converter<IDLCallbackInterface<T>>::convert):
+    * bindings/js/JSDOMGlobalObject.cpp:
+    (WebCore::callerGlobalObject):
+    (WebCore::legacyActiveGlobalObjectForAccessor):
+    * bindings/js/JSDOMGlobalObject.h:
+    * bindings/js/JSDOMWindowBase.cpp:
+    (WebCore::incumbentDOMWindow):
+    (WebCore::legacyActiveDOMWindowForAccessor):
+    * bindings/js/JSDOMWindowBase.h:
+    * bindings/scripts/CodeGeneratorJS.pm:
+    (GetJSCAttributesForAttribute):
+    (GenerateCallWith):
+    * page/Location.idl:
+    
+    LayoutTests:
+    
+    * http/tests/security/frameNavigation/context-for-location-href-gopd-expected.txt:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283410 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-01  Yusuke Suzuki  <ysuzuki@apple.com>
+
+            Disable new incumbent-window until it is fully implemented
+            https://bugs.webkit.org/show_bug.cgi?id=230261
+            <rdar://problem/83099726>
+
+            Reviewed by Chris Dumez and Geoffrey Garen.
+
+            * interpreter/CallFrame.cpp:
+            (JSC::CallFrame::globalObjectOfClosestCodeBlock):
+            * runtime/JSObject.cpp:
+            (JSC::JSObject::getOwnPropertyDescriptor):
+            * runtime/PropertySlot.h:
+
</ins><span class="cx"> 2021-09-27  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r283098. rdar://problem/83584491
</span></span></pre></div>
<a id="branchessafari612293branchSourceJavaScriptCoreinterpreterCallFramecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/JavaScriptCore/interpreter/CallFrame.cpp (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/JavaScriptCore/interpreter/CallFrame.cpp 2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/JavaScriptCore/interpreter/CallFrame.cpp    2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -247,6 +247,8 @@
</span><span class="cx"> 
</span><span class="cx"> JSGlobalObject* CallFrame::globalObjectOfClosestCodeBlock(VM& vm, CallFrame* callFrame)
</span><span class="cx"> {
</span><ins>+    // FIXME: We need to handle JSONP interpretation case in ProgramExecutable since it does not have vm.topCallFrame.
+    // rdar://83691438
</ins><span class="cx">     JSGlobalObject* globalObject = nullptr;
</span><span class="cx">     StackVisitor::visit(callFrame, vm, [&](StackVisitor& visitor) {
</span><span class="cx">         if (visitor->isWasmFrame()) {
</span></span></pre></div>
<a id="branchessafari612293branchSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/JavaScriptCore/runtime/JSObject.cpp (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/JavaScriptCore/runtime/JSObject.cpp      2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/JavaScriptCore/runtime/JSObject.cpp 2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -3677,6 +3677,8 @@
</span><span class="cx">         ASSERT_WITH_MESSAGE(slot.isCustom(), "PropertySlot::TypeCustom is required in case of PropertyAttribute::CustomAccessor");
</span><span class="cx">         descriptor.setAccessorDescriptor((slot.attributes() | PropertyAttribute::Accessor) & ~PropertyAttribute::CustomAccessor);
</span><span class="cx">         JSGlobalObject* slotBaseGlobalObject = slot.slotBase()->globalObject(vm);
</span><ins>+        if (slot.attributes() & PropertyAttribute::DOMLegacyAccessor)
+            slotBaseGlobalObject = globalObject;
</ins><span class="cx">         if (slot.customGetter())
</span><span class="cx">             descriptor.setGetter(createCustomGetterFunction(slotBaseGlobalObject, vm, propertyName, slot.customGetter(), slot.domAttribute()));
</span><span class="cx">         if (slot.customSetter())
</span></span></pre></div>
<a id="branchessafari612293branchSourceJavaScriptCoreruntimePropertySloth"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/JavaScriptCore/runtime/PropertySlot.h (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/JavaScriptCore/runtime/PropertySlot.h    2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/JavaScriptCore/runtime/PropertySlot.h       2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx">     Accessor          = 1 << 4,  // property is a getter/setter
</span><span class="cx">     CustomAccessor    = 1 << 5,
</span><span class="cx">     CustomValue       = 1 << 6,
</span><ins>+    DOMLegacyAccessor = 1 << 7, // property is a DOM legacy accessor, which holds caller's global object when it is materialized.
</ins><span class="cx">     CustomAccessorOrValue = CustomAccessor | CustomValue,
</span><span class="cx">     AccessorOrCustomAccessorOrValue = Accessor | CustomAccessor | CustomValue,
</span><span class="cx">     ReadOnlyOrAccessorOrCustomAccessor = ReadOnly | Accessor | CustomAccessor,
</span></span></pre></div>
<a id="branchessafari612293branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/WebCore/ChangeLog (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/WebCore/ChangeLog        2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/WebCore/ChangeLog   2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -1,3 +1,78 @@
</span><ins>+2021-10-01  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r283410. rdar://problem/83784775
+
+    Disable new incumbent-window until it is fully implemented
+    https://bugs.webkit.org/show_bug.cgi?id=230261
+    <rdar://problem/83099726>
+    
+    Reviewed by Chris Dumez and Geoffrey Garen.
+    
+    LayoutTests/imported/w3c:
+    
+    * web-platform-tests/html/webappapis/scripting/events/compile-event-handler-settings-objects-expected.txt:
+    * web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-incumbent-expected.txt:
+    
+    Source/JavaScriptCore:
+    
+    * interpreter/CallFrame.cpp:
+    (JSC::CallFrame::globalObjectOfClosestCodeBlock):
+    * runtime/JSObject.cpp:
+    (JSC::JSObject::getOwnPropertyDescriptor):
+    * runtime/PropertySlot.h:
+    
+    Source/WebCore:
+    
+    This patch disables new incumbent-window until it is fully implemented to avoid compatibility issue.
+    
+    * bindings/js/JSDOMConvertCallbacks.h:
+    (WebCore::Converter<IDLCallbackFunction<T>>::convert):
+    (WebCore::Converter<IDLCallbackInterface<T>>::convert):
+    * bindings/js/JSDOMGlobalObject.cpp:
+    (WebCore::callerGlobalObject):
+    (WebCore::legacyActiveGlobalObjectForAccessor):
+    * bindings/js/JSDOMGlobalObject.h:
+    * bindings/js/JSDOMWindowBase.cpp:
+    (WebCore::incumbentDOMWindow):
+    (WebCore::legacyActiveDOMWindowForAccessor):
+    * bindings/js/JSDOMWindowBase.h:
+    * bindings/scripts/CodeGeneratorJS.pm:
+    (GetJSCAttributesForAttribute):
+    (GenerateCallWith):
+    * page/Location.idl:
+    
+    LayoutTests:
+    
+    * http/tests/security/frameNavigation/context-for-location-href-gopd-expected.txt:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283410 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-01  Yusuke Suzuki  <ysuzuki@apple.com>
+
+            Disable new incumbent-window until it is fully implemented
+            https://bugs.webkit.org/show_bug.cgi?id=230261
+            <rdar://problem/83099726>
+
+            Reviewed by Chris Dumez and Geoffrey Garen.
+
+            This patch disables new incumbent-window until it is fully implemented to avoid compatibility issue.
+
+            * bindings/js/JSDOMConvertCallbacks.h:
+            (WebCore::Converter<IDLCallbackFunction<T>>::convert):
+            (WebCore::Converter<IDLCallbackInterface<T>>::convert):
+            * bindings/js/JSDOMGlobalObject.cpp:
+            (WebCore::callerGlobalObject):
+            (WebCore::legacyActiveGlobalObjectForAccessor):
+            * bindings/js/JSDOMGlobalObject.h:
+            * bindings/js/JSDOMWindowBase.cpp:
+            (WebCore::incumbentDOMWindow):
+            (WebCore::legacyActiveDOMWindowForAccessor):
+            * bindings/js/JSDOMWindowBase.h:
+            * bindings/scripts/CodeGeneratorJS.pm:
+            (GetJSCAttributesForAttribute):
+            (GenerateCallWith):
+            * page/Location.idl:
+
</ins><span class="cx"> 2021-09-27  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r283035. rdar://problem/83584492
</span></span></pre></div>
<a id="branchessafari612293branchSourceWebCorebindingsjsJSDOMGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp        2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp   2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> #include <JavaScriptCore/JSCustomSetterFunction.h>
</span><span class="cx"> #include <JavaScriptCore/JSInternalPromise.h>
</span><span class="cx"> #include <JavaScriptCore/StructureInlines.h>
</span><ins>+#include <JavaScriptCore/VMEntryScope.h>
</ins><span class="cx"> #include <JavaScriptCore/VMTrapsInlines.h>
</span><span class="cx"> #include <JavaScriptCore/WasmStreamingCompiler.h>
</span><span class="cx"> #include <JavaScriptCore/WeakGCMapInlines.h>
</span><span class="lines">@@ -560,4 +561,78 @@
</span><span class="cx">     return nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static JSDOMGlobalObject& callerGlobalObject(JSC::JSGlobalObject& lexicalGlobalObject, JSC::CallFrame* callFrame, bool skipFirstFrame, bool lookUpFromVMEntryScope)
+{
+    VM& vm = lexicalGlobalObject.vm();
+    if (callFrame) {
+        class GetCallerGlobalObjectFunctor {
+        public:
+            GetCallerGlobalObjectFunctor(bool skipFirstFrame)
+                : m_skipFirstFrame(skipFirstFrame)
+            { }
+
+            StackVisitor::Status operator()(StackVisitor& visitor) const
+            {
+                if (m_skipFirstFrame) {
+                    if (!m_hasSkippedFirstFrame) {
+                        m_hasSkippedFirstFrame = true;
+                        return StackVisitor::Continue;
+                    }
+                }
+
+                if (auto* codeBlock = visitor->codeBlock())
+                    m_globalObject = codeBlock->globalObject();
+                else {
+                    ASSERT(visitor->callee().rawPtr());
+                    // FIXME: Callee is not an object if the caller is Web Assembly.
+                    // Figure out what to do here. We can probably get the global object
+                    // from the top-most Wasm Instance. https://bugs.webkit.org/show_bug.cgi?id=165721
+                    if (visitor->callee().isCell() && visitor->callee().asCell()->isObject())
+                        m_globalObject = jsCast<JSObject*>(visitor->callee().asCell())->globalObject();
+                }
+                return StackVisitor::Done;
+            }
+
+            JSC::JSGlobalObject* globalObject() const { return m_globalObject; }
+
+        private:
+            bool m_skipFirstFrame { false };
+            mutable bool m_hasSkippedFirstFrame { false };
+            mutable JSC::JSGlobalObject* m_globalObject { nullptr };
+        };
+
+        GetCallerGlobalObjectFunctor iter(skipFirstFrame);
+        callFrame->iterate(vm, iter);
+        if (iter.globalObject())
+            return *jsCast<JSDOMGlobalObject*>(iter.globalObject());
+    }
+
+    // In the case of legacyActiveGlobalObjectForAccessor, it is possible that vm.topCallFrame is nullptr when the script is evaluated as JSONP.
+    // Since we put JSGlobalObject to VMEntryScope, we can retrieve the right globalObject from that.
+    // For callerGlobalObject, we do not check vm.entryScope to keep it the old behavior.
+    if (lookUpFromVMEntryScope) {
+        if (vm.entryScope) {
+            if (auto* result = vm.entryScope->globalObject())
+                return *jsCast<JSDOMGlobalObject*>(result);
+        }
+    }
+
+    // If we cannot find JSGlobalObject in caller frames, we just return the current lexicalGlobalObject.
+    return *jsCast<JSDOMGlobalObject*>(&lexicalGlobalObject);
+}
+
+JSDOMGlobalObject& callerGlobalObject(JSC::JSGlobalObject& lexicalGlobalObject, JSC::CallFrame* callFrame)
+{
+    constexpr bool skipFirstFrame = true;
+    constexpr bool lookUpFromVMEntryScope = false;
+    return callerGlobalObject(lexicalGlobalObject, callFrame, skipFirstFrame, lookUpFromVMEntryScope);
+}
+
+JSDOMGlobalObject& legacyActiveGlobalObjectForAccessor(JSC::JSGlobalObject& lexicalGlobalObject, JSC::CallFrame* callFrame)
+{
+    constexpr bool skipFirstFrame = false;
+    constexpr bool lookUpFromVMEntryScope = true;
+    return callerGlobalObject(lexicalGlobalObject, callFrame, skipFirstFrame, lookUpFromVMEntryScope);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari612293branchSourceWebCorebindingsjsJSDOMGlobalObjecth"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMGlobalObject.h (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMGlobalObject.h  2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMGlobalObject.h     2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -143,6 +143,8 @@
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext&, DOMWrapperWorld&);
</span><ins>+WEBCORE_EXPORT JSDOMGlobalObject& callerGlobalObject(JSC::JSGlobalObject&, JSC::CallFrame*);
+JSDOMGlobalObject& legacyActiveGlobalObjectForAccessor(JSC::JSGlobalObject&, JSC::CallFrame*);
</ins><span class="cx"> 
</span><span class="cx"> template<class JSClass>
</span><span class="cx"> JSClass* toJSDOMGlobalObject(JSC::VM& vm, JSC::JSValue value)
</span></span></pre></div>
<a id="branchessafari612293branchSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMWindowBase.cpp  2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMWindowBase.cpp     2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -284,17 +284,12 @@
</span><span class="cx"> 
</span><span class="cx"> DOMWindow& incumbentDOMWindow(JSGlobalObject& fallbackGlobalObject, CallFrame& callFrame)
</span><span class="cx"> {
</span><del>-    if (auto* globalObject = CallFrame::globalObjectOfClosestCodeBlock(fallbackGlobalObject.vm(), &callFrame))
-        return asJSDOMWindow(globalObject)->wrapped();
-    return asJSDOMWindow(&fallbackGlobalObject)->wrapped();
</del><ins>+    return asJSDOMWindow(&callerGlobalObject(fallbackGlobalObject, &callFrame))->wrapped();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> DOMWindow& incumbentDOMWindow(JSGlobalObject& fallbackGlobalObject)
</span><span class="cx"> {
</span><del>-    VM& vm = fallbackGlobalObject.vm();
-    if (auto* globalObject = CallFrame::globalObjectOfClosestCodeBlock(vm, vm.topCallFrame))
-        return asJSDOMWindow(globalObject)->wrapped();
-    return asJSDOMWindow(&fallbackGlobalObject)->wrapped();
</del><ins>+    return asJSDOMWindow(&callerGlobalObject(fallbackGlobalObject, fallbackGlobalObject.vm().topCallFrame))->wrapped();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> DOMWindow& activeDOMWindow(JSGlobalObject& lexicalGlobalObject)
</span><span class="lines">@@ -308,6 +303,16 @@
</span><span class="cx">     return asJSDOMWindow(vm.deprecatedVMEntryGlobalObject(&lexicalGlobalObject))->wrapped();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+DOMWindow& legacyActiveDOMWindowForAccessor(JSGlobalObject& fallbackGlobalObject, CallFrame& callFrame)
+{
+    return asJSDOMWindow(&legacyActiveGlobalObjectForAccessor(fallbackGlobalObject, &callFrame))->wrapped();
+}
+
+DOMWindow& legacyActiveDOMWindowForAccessor(JSGlobalObject& fallbackGlobalObject)
+{
+    return asJSDOMWindow(&legacyActiveGlobalObjectForAccessor(fallbackGlobalObject, fallbackGlobalObject.vm().topCallFrame))->wrapped();
+}
+
</ins><span class="cx"> Document* responsibleDocument(VM& vm, CallFrame& callFrame)
</span><span class="cx"> {
</span><span class="cx">     CallerFunctor functor;
</span></span></pre></div>
<a id="branchessafari612293branchSourceWebCorebindingsjsJSDOMWindowBaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMWindowBase.h (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMWindowBase.h    2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/WebCore/bindings/js/JSDOMWindowBase.h       2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -126,6 +126,9 @@
</span><span class="cx"> DOMWindow& activeDOMWindow(JSC::JSGlobalObject&);
</span><span class="cx"> DOMWindow& firstDOMWindow(JSC::JSGlobalObject&);
</span><span class="cx"> 
</span><ins>+DOMWindow& legacyActiveDOMWindowForAccessor(JSC::JSGlobalObject&, JSC::CallFrame&);
+DOMWindow& legacyActiveDOMWindowForAccessor(JSC::JSGlobalObject&);
+
</ins><span class="cx"> // FIXME: This should probably be removed in favor of one of the other DOMWindow accessors. It is intended
</span><span class="cx"> //        to provide the document specfied as the 'responsible document' in the algorithm for document.open()
</span><span class="cx"> //        (https://html.spec.whatwg.org/multipage/dynamic-markup-insertion.html#document-open-steps steps 4
</span></span></pre></div>
<a id="branchessafari612293branchSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm      2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -2055,6 +2055,7 @@
</span><span class="cx">     push(@specials, "JSC::PropertyAttribute::DontEnum") if ($attribute->extendedAttributes->{NotEnumerable} || $isGlobalConstructor);
</span><span class="cx">     push(@specials, "JSC::PropertyAttribute::ReadOnly") if IsReadonly($attribute);
</span><span class="cx">     push(@specials, "JSC::PropertyAttribute::CustomAccessor") unless $isGlobalConstructor or IsJSBuiltin($interface, $attribute);
</span><ins>+    push(@specials, "JSC::PropertyAttribute::DOMLegacyAccessor") if $attribute->extendedAttributes->{LegacyActiveWindowForAccessor};
</ins><span class="cx">     push(@specials, "JSC::PropertyAttribute::DOMAttribute") if IsAcceleratedDOMAttribute($interface, $attribute);
</span><span class="cx">     push(@specials, "JSC::PropertyAttribute::DOMJITAttribute") if $attribute->extendedAttributes->{DOMJIT};
</span><span class="cx">     push(@specials, "JSC::PropertyAttribute::Accessor | JSC::PropertyAttribute::Builtin") if  IsJSBuiltin($interface, $attribute);
</span><span class="lines">@@ -5984,6 +5985,11 @@
</span><span class="cx">         AddToImplIncludes("JSDOMWindowBase.h");
</span><span class="cx">         push(@callWithArgs, "incumbentDOMWindow(*$globalObject" . ($callFrameReference ? ", " . $callFrameReference : "") . ")");
</span><span class="cx">     }
</span><ins>+    if ($codeGenerator->ExtendedAttributeContains($callWith, "LegacyActiveWindowForAccessor")) {
+        AddToImplIncludes("DOMWindow.h");
+        AddToImplIncludes("JSDOMWindowBase.h");
+        push(@callWithArgs, "legacyActiveDOMWindowForAccessor(*$globalObject" . ($callFrameReference ? ", " . $callFrameReference : "") . ")");
+    }
</ins><span class="cx">     if ($codeGenerator->ExtendedAttributeContains($callWith, "FirstWindow")) {
</span><span class="cx">         AddToImplIncludes("DOMWindow.h");
</span><span class="cx">         AddToImplIncludes("JSDOMWindowBase.h");
</span></span></pre></div>
<a id="branchessafari612293branchSourceWebCorepageLocationidl"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.3-branch/Source/WebCore/page/Location.idl (283410 => 283411)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.3-branch/Source/WebCore/page/Location.idl        2021-10-01 22:12:09 UTC (rev 283410)
+++ branches/safari-612.2.9.3-branch/Source/WebCore/page/Location.idl   2021-10-01 22:57:32 UTC (rev 283411)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">     LegacyUnforgeable,
</span><span class="cx">     Exposed=Window
</span><span class="cx"> ] interface Location {
</span><del>-    [SetterCallWith=IncumbentWindow&FirstWindow, DoNotCheckSecurityOnSetter] stringifier attribute USVString href;
</del><ins>+    [SetterCallWith=LegacyActiveWindowForAccessor&FirstWindow, DoNotCheckSecurityOnSetter] stringifier attribute USVString href;
</ins><span class="cx"> 
</span><span class="cx">     // FIXME: We should use IncumbentWindow once we found why https://bugs.webkit.org/show_bug.cgi?id=228943 issue occured.
</span><span class="cx">     [CallWith=ActiveWindow&FirstWindow] undefined assign(USVString url);
</span><span class="lines">@@ -51,13 +51,13 @@
</span><span class="cx">     [CallWith=ActiveWindow] undefined reload();
</span><span class="cx"> 
</span><span class="cx">     // URI decomposition attributes
</span><del>-    [SetterCallWith=IncumbentWindow&FirstWindow] attribute USVString protocol;
-    [SetterCallWith=IncumbentWindow&FirstWindow] attribute USVString host;
-    [SetterCallWith=IncumbentWindow&FirstWindow] attribute USVString hostname;
-    [SetterCallWith=IncumbentWindow&FirstWindow] attribute USVString port;
-    [SetterCallWith=IncumbentWindow&FirstWindow] attribute USVString pathname;
-    [SetterCallWith=IncumbentWindow&FirstWindow] attribute USVString search;
-    [SetterCallWith=IncumbentWindow&FirstWindow] attribute USVString hash;
</del><ins>+    [SetterCallWith=LegacyActiveWindowForAccessor&FirstWindow] attribute USVString protocol;
+    [SetterCallWith=LegacyActiveWindowForAccessor&FirstWindow] attribute USVString host;
+    [SetterCallWith=LegacyActiveWindowForAccessor&FirstWindow] attribute USVString hostname;
+    [SetterCallWith=LegacyActiveWindowForAccessor&FirstWindow] attribute USVString port;
+    [SetterCallWith=LegacyActiveWindowForAccessor&FirstWindow] attribute USVString pathname;
+    [SetterCallWith=LegacyActiveWindowForAccessor&FirstWindow] attribute USVString search;
+    [SetterCallWith=LegacyActiveWindowForAccessor&FirstWindow] attribute USVString hash;
</ins><span class="cx"> 
</span><span class="cx">     readonly attribute USVString origin;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>