[webkit-changes] [WebKit/WebKit] f0bb87: Merge ResourceLoadStatisticsStore and ResourceLoad...

[Brent Fulgham]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: f0bb8782e85bede4de98d6243dd3a15f56d4807d
      https://github.com/WebKit/WebKit/commit/f0bb8782e85bede4de98d6243dd3a15f56d4807d
  Author: Brent Fulgham <bfulgham at apple.com>
  Date:   2023-08-09 (Wed, 09 Aug 2023)

  Changed paths:
    R Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp
    M Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp
    M Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h
    M Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
    M Source/WebKit/NetworkProcess/storage/SQLiteStorageArea.cpp
    M Source/WebKit/NetworkProcess/storage/SQLiteStorageArea.h
    M Source/WebKit/Sources.txt
    M Source/WebKit/WebKit.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Merge ResourceLoadStatisticsStore and ResourceLoadStatisticsDatabaseStore
https://bugs.webkit.org/show_bug.cgi?id=259715
<rdar://113236158>

Reviewed by Chris Dumez.

Now that we only have a SQLite-based ITP database, we should remove the needless layering
created by a separate ResourceLoadStatisticsStore and ResourceLoadStatisticsDatabaseStore
child class.

This will allow us to reduce complexity by removing a needless child class, but will also
remove numerous virtual method calls, type checks, and downcast operations needed to dispatch
methods to the child class.

* Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp: Removed.
* Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp: Many methods moved here
from ResourceLoadStatisticsDatabaseStore.cpp.
(WebKit::ResourceLoadStatisticsStore::computeImportance): Deleted.
* Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
(WebKit::ResourceLoadStatisticsStore::isDebugModeEnabled const): Deleted.
(WebKit::ResourceLoadStatisticsStore::setThirdPartyCookieBlockingMode): Deleted.
(WebKit::ResourceLoadStatisticsStore::thirdPartyCookieBlockingMode const): Deleted.
(WebKit::ResourceLoadStatisticsStore::setSameSiteStrictEnforcementEnabled): Deleted.
(WebKit::ResourceLoadStatisticsStore::isSameSiteStrictEnforcementEnabled const): Deleted.
(WebKit::ResourceLoadStatisticsStore::setFirstPartyWebsiteDataRemovalMode): Deleted.
(WebKit::ResourceLoadStatisticsStore::setStandaloneApplicationDomain): Deleted.
(WebKit::ResourceLoadStatisticsStore::store const): Deleted.
(WebKit::ResourceLoadStatisticsStore::isMemoryStore const): Deleted.
(WebKit::ResourceLoadStatisticsStore::isDatabaseStore const): Deleted.
(WebKit::ResourceLoadStatisticsStore::dataRecordsBeingRemoved const): Deleted.
(WebKit::ResourceLoadStatisticsStore::store): Deleted.
(WebKit::ResourceLoadStatisticsStore::workQueue): Deleted.
(WebKit::ResourceLoadStatisticsStore::classifier): Deleted.
(WebKit::ResourceLoadStatisticsStore::parameters const): Deleted.
(WebKit::ResourceLoadStatisticsStore::endOfGrandfatheringTimestamp): Deleted.
(WebKit::ResourceLoadStatisticsStore::endOfGrandfatheringTimestamp const): Deleted.
(WebKit::ResourceLoadStatisticsStore::clearEndOfGrandfatheringTimeStamp): Deleted.
(WebKit::ResourceLoadStatisticsStore::debugManualPrevalentResource const): Deleted.
(WebKit::ResourceLoadStatisticsStore::debugStaticPrevalentResource const): Deleted.
(WebKit::ResourceLoadStatisticsStore::debugLoggingEnabled const): Deleted.
(WebKit::ResourceLoadStatisticsStore::debugModeEnabled const): Deleted.
(WebKit::ResourceLoadStatisticsStore::firstPartyWebsiteDataRemovalMode const): Deleted.
(WebKit::ResourceLoadStatisticsStore::setDebugLogggingEnabled): Deleted.
* Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
(WebKit::WebResourceLoadStatisticsStore::WebResourceLoadStatisticsStore): Update to call method directly,
rather than using is<> and downcast<>.
(WebKit::WebResourceLoadStatisticsStore::populateMemoryStoreFromDisk): Ditto.
(WebKit::WebResourceLoadStatisticsStore::statisticsDatabaseHasAllTables): Ditto.
(WebKit::WebResourceLoadStatisticsStore::performDailyTasks): Ditto.
(WebKit::WebResourceLoadStatisticsStore::isRelationshipOnlyInDatabaseOnce): Ditto.
(WebKit::WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent): Ditto.
(WebKit::WebResourceLoadStatisticsStore::domainIDExistsInDatabase): Ditto.
(WebKit::WebResourceLoadStatisticsStore::suspend): Ditto.
* Source/WebKit/Sources.txt:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/266741@main