Attachment 347546 Details for Bug 188756 – Patch

[patch] Patch

bug-188756-20180820143358.patch (text/plain), 6.34 KB, created by Brent Fulgham on 2018-08-20 14:33:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2018-08-20 14:33:59 PDT

Size: 6.34 KB

patch

obsolete

>Subversion Revision: 235092
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9d5c8f7cd8e88e5402f5c8346313e2e1d95915aa..079bfd34ba3275690c864a67b17bf6a27d349eab 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-08-20  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Remove experimental affiliated domain code now that StorageAccess API is available
>+        https://bugs.webkit.org/show_bug.cgi?id=188756
>+        <rdar://problem/43527848>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        In Bug 174661 we added a compatibility quirk to support wsj.com authentication. This quirk is no longer needed,
>+        since the StorageAccess API provides the necessary tools to do this type of interaction without needing global
>+        cross-site access.
>+
>+        * loader/ResourceLoadObserver.cpp:
>+        (WebCore::ResourceLoadObserver::logSubresourceLoading):
>+        (WebCore::ResourceLoadObserver::logWebSocketLoading):
>+        (WebCore::areDomainsAssociated): Deleted.
>+        * loader/ResourceLoadStatistics.cpp:
>+        (WebCore::ResourceLoadStatistics::areDomainsAssociated): Deleted.
>+        * loader/ResourceLoadStatistics.h:
>+
> 2018-08-20  David Kilzer  <ddkilzer@apple.com>
> 
>         REGRESSION (r223192): Remove invalid `path` for Modules/geolocation/ios folder
>diff --git a/Source/WebCore/loader/ResourceLoadObserver.cpp b/Source/WebCore/loader/ResourceLoadObserver.cpp
>index 511b912a2540c3926304abedcb8ec04540217092..965557d0923450f0877bc8aaacadc3fb475abc85 100644
>--- a/Source/WebCore/loader/ResourceLoadObserver.cpp
>+++ b/Source/WebCore/loader/ResourceLoadObserver.cpp
>@@ -68,11 +68,6 @@ static bool shouldEnableSiteSpecificQuirks(Page* page)
> #endif
> }
> 
>-static bool areDomainsAssociated(Page* page, const String& firstDomain, const String& secondDomain)
>-{
>-    return ResourceLoadStatistics::areDomainsAssociated(shouldEnableSiteSpecificQuirks(page), firstDomain, secondDomain);
>-}
>-
> void ResourceLoadObserver::setNotificationCallback(WTF::Function<void (Vector<ResourceLoadStatistics>&&)>&& notificationCallback)
> {
>     ASSERT(!m_notificationCallback);
>@@ -127,9 +122,6 @@ void ResourceLoadObserver::logSubresourceLoading(const Frame* frame, const Resou
>     auto mainFramePrimaryDomain = primaryDomain(mainFrameURL);
>     auto sourcePrimaryDomain = primaryDomain(sourceURL);
>     
>-    if (areDomainsAssociated(page, targetPrimaryDomain, mainFramePrimaryDomain) || (isRedirect && areDomainsAssociated(page, targetPrimaryDomain, sourcePrimaryDomain)))
>-        return;
>-
>     bool shouldCallNotificationCallback = false;
>     {
>         auto& targetStatistics = ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);
>@@ -174,9 +166,6 @@ void ResourceLoadObserver::logWebSocketLoading(const Frame* frame, const URL& ta
>     auto targetPrimaryDomain = primaryDomain(targetURL);
>     auto mainFramePrimaryDomain = primaryDomain(mainFrameURL);
>     
>-    if (areDomainsAssociated(page, targetPrimaryDomain, mainFramePrimaryDomain))
>-        return;
>-
>     auto& targetStatistics = ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);
>     targetStatistics.lastSeen = ResourceLoadStatistics::reduceTimeResolution(WallTime::now());
>     if (targetStatistics.subresourceUnderTopFrameOrigins.add(mainFramePrimaryDomain).isNewEntry)
>diff --git a/Source/WebCore/loader/ResourceLoadStatistics.cpp b/Source/WebCore/loader/ResourceLoadStatistics.cpp
>index d75639c62c0385e655c6b91d9e9cdf0748443af4..9e2b7cf31519ceb3856c38616c75720724f70ede 100644
>--- a/Source/WebCore/loader/ResourceLoadStatistics.cpp
>+++ b/Source/WebCore/loader/ResourceLoadStatistics.cpp
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2016-2017 Apple Inc.  All rights reserved.
>+ * Copyright (C) 2016-2018 Apple Inc.  All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -353,40 +353,6 @@ String ResourceLoadStatistics::primaryDomain(StringView host)
>     return hostString;
> }
> 
>-// FIXME: Temporary fix for <rdar://problem/32343256> until content can be updated.
>-bool ResourceLoadStatistics::areDomainsAssociated(bool needsSiteSpecificQuirks, const String& firstDomain, const String& secondDomain)
>-{
>-    ASSERT(isMainThread());
>-
>-    static NeverDestroyed<HashMap<String, unsigned>> metaDomainIdentifiers = [] {
>-        HashMap<String, unsigned> map;
>-
>-        // Domains owned by Dow Jones & Company, Inc.
>-        const unsigned dowJonesIdentifier = 1;
>-        map.add("dowjones.com"_s, dowJonesIdentifier);
>-        map.add("wsj.com"_s, dowJonesIdentifier);
>-        map.add("barrons.com"_s, dowJonesIdentifier);
>-        map.add("marketwatch.com"_s, dowJonesIdentifier);
>-        map.add("wsjplus.com"_s, dowJonesIdentifier);
>-
>-        return map;
>-    }();
>-
>-    if (firstDomain == secondDomain)
>-        return true;
>-
>-    ASSERT(!equalIgnoringASCIICase(firstDomain, secondDomain));
>-
>-    if (!needsSiteSpecificQuirks)
>-        return false;
>-
>-    unsigned firstMetaDomainIdentifier = metaDomainIdentifiers.get().get(firstDomain);
>-    if (!firstMetaDomainIdentifier)
>-        return false;
>-
>-    return firstMetaDomainIdentifier == metaDomainIdentifiers.get().get(secondDomain);
>-}
>-
> WallTime ResourceLoadStatistics::reduceTimeResolution(WallTime time)
> {
>     return WallTime::fromRawSeconds(std::floor(time.secondsSinceEpoch() / timestampResolution) * timestampResolution.seconds());
>diff --git a/Source/WebCore/loader/ResourceLoadStatistics.h b/Source/WebCore/loader/ResourceLoadStatistics.h
>index eb9c7b6906493dd9e78b45d8c1b87e7431d9b033..8c9ed4c2ba1fb34a59b6322d9beebaff83b62d40 100644
>--- a/Source/WebCore/loader/ResourceLoadStatistics.h
>+++ b/Source/WebCore/loader/ResourceLoadStatistics.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2016-2017 Apple Inc.  All rights reserved.
>+ * Copyright (C) 2016-2018 Apple Inc.  All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -53,7 +53,6 @@ struct ResourceLoadStatistics {
>     WEBCORE_EXPORT static String primaryDomain(const URL&);
>     WEBCORE_EXPORT static String primaryDomain(StringView host);
> 
>-    WEBCORE_EXPORT static bool areDomainsAssociated(bool needsSiteSpecificQuirks, const String&, const String&);
>     WEBCORE_EXPORT static WallTime reduceTimeResolution(WallTime);
> 
>     WEBCORE_EXPORT void encode(KeyedEncoder&) const;

Actions: View | Formatted Diff | Diff

Attachments on bug 188756: 347546 | 347576 | 347648 | 347659 | 347664