Attachment 342098 Details for Bug 186358 – Patch

[patch] Patch

bug-186358-20180606171845.patch (text/plain), 15.04 KB, created by Brent Fulgham on 2018-06-06 17:18:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2018-06-06 17:18:46 PDT

Size: 15.04 KB

patch

obsolete

>Subversion Revision: 232560
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index a9b0c46505e2e0ca623c6472cbfbb74c74e62036..5ead3de8b87f85002abb93015bbc6708c44eda33 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-06  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Remove unused debug mode conditions
>+        https://bugs.webkit.org/show_bug.cgi?id=186358
>+        <rdar://problem/39117121>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove some unused code paths related to ResourceLoadStatistics debug mode.
>+
>+        * UIProcess/WebResourceLoadStatisticsStore.cpp:
>+        (WebKit::WebResourceLoadStatisticsStore::logUserInteraction):
>+        (WebKit::WebResourceLoadStatisticsStore::shouldPartitionCookies const):
>+
> 2018-06-06  Antoine Quint  <graouts@apple.com>
> 
>         Rename color-filter to -apple-color-filter and do not expose it to Web content
>diff --git a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>index 3e78315ac79bae823ef117bbb7ec767ea8b10d5b..5382a55610f730c4f85be88a67a2d556df70f588 100644
>--- a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>+++ b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>@@ -556,12 +556,8 @@ void WebResourceLoadStatisticsStore::logUserInteraction(const URL& url)
>         statistics.hadUserInteraction = true;
>         statistics.mostRecentUserInteractionTime = WallTime::now();
> 
>-        if (m_debugModeEnabled) {
>-            if (statistics.isMarkedForCookieBlocking)
>-                updateCookiePartitioningForDomains({ primaryDomain }, { }, { }, ShouldClearFirst::No, []() { });
>-        } else
>-            if (statistics.isMarkedForCookiePartitioning || statistics.isMarkedForCookieBlocking)
>-                updateCookiePartitioningForDomains({ }, { }, { primaryDomain }, ShouldClearFirst::No, []() { });
>+        if (statistics.isMarkedForCookieBlocking)
>+            updateCookiePartitioningForDomains({ primaryDomain }, { }, { }, ShouldClearFirst::No, []() { });
>     });
> }
> 
>@@ -1057,10 +1053,7 @@ void WebResourceLoadStatisticsStore::mergeStatistics(Vector<ResourceLoadStatisti
> 
> bool WebResourceLoadStatisticsStore::shouldPartitionCookies(const ResourceLoadStatistics& statistic) const
> {
>-    if (m_debugModeEnabled)
>-        return statistic.isPrevalentResource && statistic.hadUserInteraction;
>-
>-    return statistic.isPrevalentResource && statistic.hadUserInteraction && WallTime::now() > statistic.mostRecentUserInteractionTime + m_parameters.timeToLiveCookiePartitionFree;
>+    return statistic.isPrevalentResource && statistic.hadUserInteraction;
> }
> 
> bool WebResourceLoadStatisticsStore::shouldBlockCookies(const ResourceLoadStatistics& statistic) const
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 8057c3aba0da6b31381724a2b49bdb6b766513a3..79a957a9d4053c1b5c33391e7139d14543ca8c26 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-06-06  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Remove unused debug mode conditions
>+        https://bugs.webkit.org/show_bug.cgi?id=186358
>+        <rdar://problem/39117121>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rebase test expectations after behavior change.
>+
>+        * http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-expected.txt:
>+        * http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context.html:
>+        * http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt:
>+        * http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html:
>+        * http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt:
>+        * http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html:
>+        * http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt:
>+        * http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html:
>+
> 2018-06-06  David Fenton  <david_fenton@apple.com>
> 
>         Layout Test http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction.html is flaky on macOS WK2 [ Release ]
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-expected.txt
>index fc3c3d4794f3c848808125ee24101eb686b84091..73f18d01366d2387278412e88c10fa42764b03d7 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-expected.txt
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-expected.txt
>@@ -28,7 +28,7 @@ Client-side document.cookie: partitionedCookie=value
> --------
> Frame: ''
> --------
>-After user interaction, should receive one non-partitioned, first party cookie.
>-Received cookie named 'firstPartyCookie'.
>-Did not receive cookie named 'partitionedCookie'.
>-Client-side document.cookie: firstPartyCookie=value
>+After user interaction, should still only receive one partitioned, third party cookie.
>+Did not receive cookie named 'firstPartyCookie'.
>+Received cookie named 'partitionedCookie'.
>+Client-side document.cookie: partitionedCookie=value
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context.html b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context.html
>index b8df5aee09c130c3da67b2400ca44cb84c11dae0..f2b416645627f7eec8a40b573331afe7fad31460 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context.html
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context.html
>@@ -76,7 +76,7 @@
>                 break;
>             case "#step6":
>                 // Load localhost under 127.0.0.1 and check that it gets its non-partitioned cookie after user interaction.
>-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After user interaction, should receive one non-partitioned, first party cookie.", finishTest);
>+                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After user interaction, should still only receive one partitioned, third party cookie.", finishTest);
>                 break;
>         }
>     }
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt
>index a53351128d056f513fbe15577d3fd222c1e04bad..50e82c81652ca42bdf0598f59ba8e946907cde2a 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt
>@@ -28,10 +28,10 @@ Client-side document.cookie: thirdPartyCookie=value
> --------
> Frame: ''
> --------
>-After first user interaction, should only receive un-partitioned cookie.
>-Received cookie named 'firstPartyCookie'.
>-Did not receive cookie named 'thirdPartyCookie'.
>-Client-side document.cookie: firstPartyCookie=value
>+After first user interaction, should still only receive a partitioned, third-party cookie.
>+Did not receive cookie named 'firstPartyCookie'.
>+Received cookie named 'thirdPartyCookie'.
>+Client-side document.cookie: thirdPartyCookie=value
> 
> --------
> Frame: ''
>@@ -44,7 +44,7 @@ Client-side document.cookie: thirdPartyCookie=value
> --------
> Frame: ''
> --------
>-After second user interaction, should only receive un-partitioned cookie.
>-Received cookie named 'firstPartyCookie'.
>-Did not receive cookie named 'thirdPartyCookie'.
>-Client-side document.cookie: firstPartyCookie=value
>+After second user interaction, should still only receive a partitioned, third-party cookie.
>+Did not receive cookie named 'firstPartyCookie'.
>+Received cookie named 'thirdPartyCookie'.
>+Client-side document.cookie: thirdPartyCookie=value
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html
>index 0166c695eb4aa29f2e7e55f627b4b82b91de475d..d722d739708ef74248ae3657b55dee2f542b5e19 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html
>@@ -83,7 +83,7 @@
>             case "#step5":
>                 // http://localhost:8000 now has user interaction, check that un-partitioned cookie is sent for third-party
>                 document.location.hash = "step6";
>-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After first user interaction, should only receive un-partitioned cookie.",
>+                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After first user interaction, should still only receive a partitioned, third-party cookie.",
>                     setShortCookiePartitioningTimeOutPlusFireShouldPartitionCookiesHandlerAndContinue);
>                 break;
>             case "#step6":
>@@ -94,7 +94,7 @@
>                 break;
>             case "#step7":
>                 // http://localhost:8000 now has fresh user interaction, check that un-partitioned cookie is sent for third-party
>-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After second user interaction, should only receive un-partitioned cookie.",
>+                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After second user interaction, should still only receive a partitioned, third-party cookie.",
>                     finishTest);
>                 break;
>         }
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt
>index ee90c6ac2461be71371ec148583fc7068cafc34a..81b25e729fec277ca3faefa235c57f329a72adda 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt
>@@ -28,7 +28,7 @@ Client-side document.cookie: thirdPartyCookie=value
> --------
> Frame: ''
> --------
>-After user interaction, should only receive non-partitioned, first party cookie.
>-Received cookie named 'firstPartyCookie'.
>-Did not receive cookie named 'thirdPartyCookie'.
>-Client-side document.cookie: firstPartyCookie=value
>+After user interaction, should still only receive a partitioned, third-party cookie.
>+Did not receive cookie named 'firstPartyCookie'.
>+Received cookie named 'thirdPartyCookie'.
>+Client-side document.cookie: thirdPartyCookie=value
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html
>index ce7fe4ce45a7c14ca2e23daa3a831bbdebb851e3..a3b0dcea819f800ed3697afea16a04e49fcdf23b 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html
>@@ -65,7 +65,7 @@
>                 openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should only receive partitioned, third party cookie.", setUserInteractionAndContinue);
>                 break;
>             case "#step5":
>-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After user interaction, should only receive non-partitioned, first party cookie.", finishTest);
>+                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After user interaction, should still only receive a partitioned, third-party cookie.", finishTest);
>                 break;
>         }
>     }
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt
>index 1b384a874747b9f215b02766e0fc9bc613780e66..405627ccb94f2da22a3290d418a3da4e93d24ca4 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt
>@@ -36,8 +36,8 @@ Client-side document.cookie: partitionedThirdPartyCookie=value
> --------
> Frame: ''
> --------
>-After user interaction, should receive non-partitioned cookies set in a first-party context and in a third-party context.
>-Received cookie named 'firstPartyCookie'.
>-Received cookie named 'thirdPartyCookie'.
>-Did not receive cookie named 'partitionedThirdPartyCookie'.
>-Client-side document.cookie: firstPartyCookie=value,thirdPartyCookie=value
>+After user interaction, should should still only receive a partitioned, third-party cookie.
>+Did not receive cookie named 'firstPartyCookie'.
>+Did not receive cookie named 'thirdPartyCookie'.
>+Received cookie named 'partitionedThirdPartyCookie'.
>+Client-side document.cookie: partitionedThirdPartyCookie=value
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html b/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html
>index 84fdc979aed37df5c9d2110170e1ae8ca75dad2c..47284b604076bdf57f0d19cf6e13540ae8cf335f 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html
>@@ -81,7 +81,7 @@
>                 openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should only receive partitioned, third party cookie.", setUserInteractionAndContinue);
>                 break;
>             case "#step7":
>-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After user interaction, should receive non-partitioned cookies set in a first-party context and in a third-party context.", finishTest);
>+                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After user interaction, should should still only receive a partitioned, third-party cookie.", finishTest);
>                 break;
>         }
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 186358: 342068 | 342079 | 342086 | 342098