<!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>[283544] trunk/Source/WebCore</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/283544">283544</a></dd>
<dt>Author</dt> <dd>ntim@apple.com</dd>
<dt>Date</dt> <dd>2021-10-05 03:59:56 -0700 (Tue, 05 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Replace document.topDocument().securityOrigin() with document.topOrigin()
https://bugs.webkit.org/show_bug.cgi?id=231221

Reviewed by Youenn Fablet.

No behaviour change, Document::topOrigin() is defined as:

`SecurityOrigin& topOrigin() const final { return topDocument().securityOrigin(); }`

* dom/BroadcastChannel.cpp:
(WebCore::shouldPartitionOrigin):
* dom/DocumentStorageAccess.cpp:
(WebCore::DocumentStorageAccess::hasStorageAccessQuickCheck):
(WebCore::DocumentStorageAccess::hasStorageAccess):
(WebCore::DocumentStorageAccess::requestStorageAccessQuickCheck):
(WebCore::DocumentStorageAccess::requestStorageAccess):
* dom/Element.cpp:
(WebCore::Element::focus):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomBroadcastChannelcpp">trunk/Source/WebCore/dom/BroadcastChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentStorageAccesscpp">trunk/Source/WebCore/dom/DocumentStorageAccess.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (283543 => 283544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-05 09:54:35 UTC (rev 283543)
+++ trunk/Source/WebCore/ChangeLog      2021-10-05 10:59:56 UTC (rev 283544)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2021-10-05  Tim Nguyen  <ntim@apple.com>
</span><span class="cx"> 
</span><ins>+        Replace document.topDocument().securityOrigin() with document.topOrigin()
+        https://bugs.webkit.org/show_bug.cgi?id=231221
+
+        Reviewed by Youenn Fablet.
+
+        No behaviour change, Document::topOrigin() is defined as:
+
+        `SecurityOrigin& topOrigin() const final { return topDocument().securityOrigin(); }`
+
+        * dom/BroadcastChannel.cpp:
+        (WebCore::shouldPartitionOrigin):
+        * dom/DocumentStorageAccess.cpp:
+        (WebCore::DocumentStorageAccess::hasStorageAccessQuickCheck):
+        (WebCore::DocumentStorageAccess::hasStorageAccess):
+        (WebCore::DocumentStorageAccess::requestStorageAccessQuickCheck):
+        (WebCore::DocumentStorageAccess::requestStorageAccess):
+        * dom/Element.cpp:
+        (WebCore::Element::focus):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestResource):
+
+2021-10-05  Tim Nguyen  <ntim@apple.com>
+
</ins><span class="cx">         Clean up shouldAutofocus in HTMLFormControlElement.cpp
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=231220
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomBroadcastChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/BroadcastChannel.cpp (283543 => 283544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/BroadcastChannel.cpp    2021-10-05 09:54:35 UTC (rev 283543)
+++ trunk/Source/WebCore/dom/BroadcastChannel.cpp       2021-10-05 10:59:56 UTC (rev 283544)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">     if (!page)
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><del>-    return !page->chrome().client().hasPageLevelStorageAccess(RegistrableDomain::uncheckedCreateFromHost(document.topDocument().securityOrigin().host()), RegistrableDomain::uncheckedCreateFromHost(document.securityOrigin().host()));
</del><ins>+    return !page->chrome().client().hasPageLevelStorageAccess(RegistrableDomain::uncheckedCreateFromHost(document.topOrigin().host()), RegistrableDomain::uncheckedCreateFromHost(document.securityOrigin().host()));
</ins><span class="cx"> #else
</span><span class="cx">     return true;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStorageAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentStorageAccess.cpp (283543 => 283544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStorageAccess.cpp       2021-10-05 09:54:35 UTC (rev 283543)
+++ trunk/Source/WebCore/dom/DocumentStorageAccess.cpp  2021-10-05 10:59:56 UTC (rev 283544)
</span><span class="lines">@@ -82,15 +82,14 @@
</span><span class="cx">     if (frame && hasFrameSpecificStorageAccess())
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><del>-    if (!frame || m_document.securityOrigin().isUnique())
</del><ins>+    auto& securityOrigin = m_document.securityOrigin();
+    if (!frame || securityOrigin.isUnique())
</ins><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     if (frame->isMainFrame())
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><del>-    auto& securityOrigin = m_document.securityOrigin();
-    auto& topSecurityOrigin = m_document.topDocument().securityOrigin();
-    if (securityOrigin.equal(&topSecurityOrigin))
</del><ins>+    if (securityOrigin.equal(&m_document.topOrigin()))
</ins><span class="cx">         return true;
</span><span class="cx"> 
</span><span class="cx">     auto* page = frame->page();
</span><span class="lines">@@ -124,7 +123,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    page->chrome().client().hasStorageAccess(RegistrableDomain::uncheckedCreateFromHost(m_document.securityOrigin().host()), RegistrableDomain::uncheckedCreateFromHost(m_document.topDocument().securityOrigin().host()), *frame, [weakThis = makeWeakPtr(*this), promise = WTFMove(promise)] (bool hasAccess) {
</del><ins>+    page->chrome().client().hasStorageAccess(RegistrableDomain::uncheckedCreateFromHost(m_document.securityOrigin().host()), RegistrableDomain::uncheckedCreateFromHost(m_document.topOrigin().host()), *frame, [weakThis = makeWeakPtr(*this), promise = WTFMove(promise)] (bool hasAccess) {
</ins><span class="cx">         if (!weakThis)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="lines">@@ -153,16 +152,14 @@
</span><span class="cx">     if (frame && hasFrameSpecificStorageAccess())
</span><span class="cx">         return StorageAccessQuickResult::Grant;
</span><span class="cx"> 
</span><del>-    if (!frame || m_document.securityOrigin().isUnique() || !isAllowedToRequestStorageAccess())
</del><ins>+    auto& securityOrigin = m_document.securityOrigin();
+    if (!frame || securityOrigin.isUnique() || !isAllowedToRequestStorageAccess())
</ins><span class="cx">         return StorageAccessQuickResult::Reject;
</span><span class="cx"> 
</span><span class="cx">     if (frame->isMainFrame())
</span><span class="cx">         return StorageAccessQuickResult::Grant;
</span><span class="cx"> 
</span><del>-    auto& topDocument = m_document.topDocument();
-    auto& topSecurityOrigin = topDocument.securityOrigin();
-    auto& securityOrigin = m_document.securityOrigin();
-    if (securityOrigin.equal(&topSecurityOrigin))
</del><ins>+    if (securityOrigin.equal(&m_document.topOrigin()))
</ins><span class="cx">         return StorageAccessQuickResult::Grant;
</span><span class="cx"> 
</span><span class="cx">     // If there is a sandbox, it has to allow the storage access API to be called.
</span><span class="lines">@@ -202,7 +199,7 @@
</span><span class="cx">     if (!page->settings().storageAccessAPIPerPageScopeEnabled())
</span><span class="cx">         m_storageAccessScope = StorageAccessScope::PerFrame;
</span><span class="cx"> 
</span><del>-    page->chrome().client().requestStorageAccess(RegistrableDomain::uncheckedCreateFromHost(m_document.securityOrigin().host()), RegistrableDomain::uncheckedCreateFromHost(m_document.topDocument().securityOrigin().host()), *frame, m_storageAccessScope, [this, weakThis = makeWeakPtr(*this), promise = WTFMove(promise)] (RequestStorageAccessResult result) mutable {
</del><ins>+    page->chrome().client().requestStorageAccess(RegistrableDomain::uncheckedCreateFromHost(m_document.securityOrigin().host()), RegistrableDomain::uncheckedCreateFromHost(m_document.topOrigin().host()), *frame, m_storageAccessScope, [this, weakThis = makeWeakPtr(*this), promise = WTFMove(promise)] (RequestStorageAccessResult result) mutable {
</ins><span class="cx">         if (!weakThis)
</span><span class="cx">             return;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (283543 => 283544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp     2021-10-05 09:54:35 UTC (rev 283543)
+++ trunk/Source/WebCore/dom/Element.cpp        2021-10-05 10:59:56 UTC (rev 283544)
</span><span class="lines">@@ -3097,7 +3097,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (Page* page = document->page()) {
</span><span class="cx">         auto& frame = *document->frame();
</span><del>-        if (!frame.hasHadUserInteraction() && !frame.isMainFrame() && !document->topDocument().securityOrigin().isSameOriginDomain(document->securityOrigin()))
</del><ins>+        if (!frame.hasHadUserInteraction() && !frame.isMainFrame() && !document->topOrigin().isSameOriginDomain(document->securityOrigin()))
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         FocusOptions optionsWithVisibility = options;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (283543 => 283544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp       2021-10-05 09:54:35 UTC (rev 283543)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp  2021-10-05 10:59:56 UTC (rev 283544)
</span><span class="lines">@@ -950,7 +950,7 @@
</span><span class="cx">             else if (auto* topDocument = frame.mainFrame().document())
</span><span class="cx">                 sameOriginRequest = topDocument->securityOrigin().isSameSchemeHostPort(requestedOrigin.get());
</span><span class="cx">         } else if (document()) {
</span><del>-            sameOriginRequest = document()->topDocument().securityOrigin().isSameSchemeHostPort(requestedOrigin.get())
</del><ins>+            sameOriginRequest = document()->topOrigin().isSameSchemeHostPort(requestedOrigin.get())
</ins><span class="cx">                 && document()->securityOrigin().isSameSchemeHostPort(requestedOrigin.get());
</span><span class="cx">         }
</span><span class="cx">         for (auto& fields : m_documentLoader->customHeaderFields()) {
</span></span></pre>
</div>
</div>

</body>
</html>