Attachment 338798 Details for Bug 184987 – Patch

[patch] Patch

bug-184987-20180425144604.patch (text/plain), 2.94 KB, created by Daniel Bates on 2018-04-25 14:46:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-04-25 14:46:05 PDT

Size: 2.94 KB

patch

obsolete

>Subversion Revision: 230977
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8d757377312d727017ed046f85ba9b7f2eeb8fb0..550298b7ccf19f61aa3d2be3e86f96cc4be57b8c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-04-25  Daniel Bates  <dabates@apple.com>
>+
>+        Unconditionally set ResourceRequest::isTopSite()
>+        https://bugs.webkit.org/show_bug.cgi?id=184987
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        As it turns out ResourceRequest::isTopSite() is useful outside of Same-Site cookies
>+        to know if a request is a top-level navigation. We should support tracking this state
>+        independent of the state of the request's "same-site"-ness. We are not currently using
>+        ResourceRequest::isTopSite() outside of the Same-Site cookie code. We will in a subsequent
>+        commit.
>+
>+        * loader/FrameLoader.cpp:
>+        (WebCore::FrameLoader::addExtraFieldsToRequest): Unconditionally set the request's top-
>+        site state.
>+        * platform/network/ResourceRequestBase.cpp:
>+        (WebCore::ResourceRequestBase::setAsIsolatedCopy): Unconditionally copy the request's
>+        top-site state.
>+
> 2018-04-24  Simon Fraser  <simon.fraser@apple.com>
> 
>         shape-outside and filter styles occur twice in the result of getComputedStyle
>diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
>index 97cf0b68e114f17a56f041aa7ab084f35002f0d5..723a352af7e5bce7c993fbcba3909236a7201236 100644
>--- a/Source/WebCore/loader/FrameLoader.cpp
>+++ b/Source/WebCore/loader/FrameLoader.cpp
>@@ -2707,8 +2707,8 @@ void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadTyp
>             ASSERT(ownerFrame || m_frame.isMainFrame());
>         }
>         addSameSiteInfoToRequestIfNeeded(request, initiator);
>-        request.setIsTopSite(isMainResource && m_frame.isMainFrame());
>     }
>+    request.setIsTopSite(isMainResource && m_frame.isMainFrame());
> 
>     Page* page = frame().page();
>     bool hasSpecificCachePolicy = request.cachePolicy() != UseProtocolCachePolicy;
>diff --git a/Source/WebCore/platform/network/ResourceRequestBase.cpp b/Source/WebCore/platform/network/ResourceRequestBase.cpp
>index 2b650cbb4eef1eefc4a4d9bf165e52bd72c1f6a9..4fbb5742dcf52c9c59d9bf4c13b656f45a0e5660 100644
>--- a/Source/WebCore/platform/network/ResourceRequestBase.cpp
>+++ b/Source/WebCore/platform/network/ResourceRequestBase.cpp
>@@ -66,10 +66,9 @@ void ResourceRequestBase::setAsIsolatedCopy(const ResourceRequest& other)
>     setInitiatorIdentifier(other.initiatorIdentifier().isolatedCopy());
>     setCachePartition(other.cachePartition().isolatedCopy());
> 
>-    if (!other.isSameSiteUnspecified()) {
>+    if (!other.isSameSiteUnspecified())
>         setIsSameSite(other.isSameSite());
>-        setIsTopSite(other.isTopSite());
>-    }
>+    setIsTopSite(other.isTopSite());
> 
>     updateResourceRequest();
>     m_httpHeaderFields = other.httpHeaderFields().isolatedCopy();

Actions: View | Formatted Diff | Diff

Attachments on bug 184987: 338798