Refactor ResourceLoadStatisticsStore::registrableDomainsToDeleteOrRestrictWebsiteDataFor() to return a struct instead of a Vector of pairs

• Component: WebKit Misc.
• Status: RESOLVED FIXED

[John Wilander]

The current return type Vector<std::pair<RegistrableDomain, WebsiteDataToRemove>> of ResourceLoadStatisticsStore::registrableDomainsToDeleteOrRestrictWebsiteDataFor() is ill-suited for its purpose since the destination NetworkProcess::deleteAndRestrictWebsiteDataForRegistrableDomains() needs separate Vectors to delete website data for. It should instead return a struct with Vectors ready to use. This would also prepare for additional use of that struct for other types of website data deletion or restriction.

[Radar WebKit Bug Importer]

<rdar://problem/60808759>

[John Wilander]

This was requested by Alex Christensen as a follow-up when the code first landed: https://bugs.webkit.org/show_bug.cgi?id=195923#c7

[John Wilander]

Created attachment 394352 [details]
Patch

[John Wilander]

Comment on attachment 394352 [details]
Patch

Thanks, Alex!

[EWS]

Committed r258928: <https://trac.webkit.org/changeset/258928>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 394352 [details].

[Chris Dumez]

Reverted r258928 for reason:

Broke the build

Committed r258932: <https://trac.webkit.org/changeset/258932>

[Chris Dumez]

(In reply to Chris Dumez from comment #6)
> Reverted r258928 for reason:
> 
> Broke the build
> 
> Committed r258932: <https://trac.webkit.org/changeset/258932>

In file included from WebKitBuild/Debug/DerivedSources/WebKit2/unified-sources/UnifiedSource10.cpp:3:
/Volumes/Data/WebKit/OpenSource/Source/WebKit/NetworkProcess/NetworkProcess.cpp:1783:71: error: no member named 'size' in 'WebKit::RegistrableDomainsToDeleteOrRestrictWebsiteDataFor'
            registrableDomainsToDelete.reserveInitialCapacity(domains.size());
Source/WebKit/NetworkProcess/NetworkProcess.cpp:1784:31: error: invalid range expression of type 'WebKit::RegistrableDomainsToDeleteOrRestrictWebsiteDataFor'; no viable 'begin' function available
            for (auto& domain : domains)
2 errors generated.

[John Wilander]

Created attachment 394463 [details]
Patch for landing

[EWS]

Committed r258969: <https://trac.webkit.org/changeset/258969>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 394463 [details].