[webkit-changes] [WebKit/WebKit] 09f7f3: Move PrivateClickMeasurement nested classes to sep...

EWS noreply at github.com
Mon Sep 26 08:30:32 PDT 2022 

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 09f7f382f655d2459e9595663d914a05626e8f7a
      https://github.com/WebKit/WebKit/commit/09f7f382f655d2459e9595663d914a05626e8f7a
  Author: Alex Christensen <achristensen at webkit.org>
  Date:   2022-09-26 (Mon, 26 Sep 2022)

  Changed paths:
    M Source/WebCore/Headers.cmake
    M Source/WebCore/Sources.txt
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    M Source/WebCore/html/HTMLAnchorElement.cpp
    M Source/WebCore/html/HTMLAnchorElement.h
    A Source/WebCore/loader/AttributionSecondsUntilSendData.h
    A Source/WebCore/loader/AttributionTimeToSendData.h
    A Source/WebCore/loader/AttributionTriggerData.cpp
    A Source/WebCore/loader/AttributionTriggerData.h
    A Source/WebCore/loader/EphemeralNonce.h
    A Source/WebCore/loader/PCMSites.h
    A Source/WebCore/loader/PCMTokens.h
    M Source/WebCore/loader/PrivateClickMeasurement.cpp
    M Source/WebCore/loader/PrivateClickMeasurement.h
    M Source/WebCore/loader/cocoa/PrivateClickMeasurementCocoa.mm
    M Source/WebKit/NetworkProcess/DatabaseUtilities.cpp
    M Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
    M Source/WebKit/NetworkProcess/NetworkResourceLoader.h
    M Source/WebKit/NetworkProcess/NetworkSession.cpp
    M Source/WebKit/NetworkProcess/NetworkSession.h
    M Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp
    M Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.h
    M Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.cpp
    M Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.h
    M Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerInterface.h
    M Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp
    M Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.h
    M Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.cpp
    M Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.h
    M Source/WebKit/Platform/IPC/DaemonCoders.cpp
    M Source/WebKit/Platform/IPC/DaemonCoders.h
    M Source/WebKit/Scripts/generate-serializers.py
    M Source/WebKit/Scripts/webkit/tests/GeneratedSerializers.h
    M Source/WebKit/Scripts/webkit/tests/SerializedTypeInfo.cpp
    M Source/WebKit/Scripts/webkit/tests/TestSerializedType.serialization.in
    M Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
    M Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm
    M Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm
    M Tools/TestWebKitAPI/Tests/WebCore/PrivateClickMeasurement.cpp
    M Tools/TestWebKitAPI/Tests/WebCore/cocoa/PrivateClickMeasurementCocoa.mm

  Log Message:
  -----------
  Move PrivateClickMeasurement nested classes to separate headers and generate serializers
https://bugs.webkit.org/show_bug.cgi?id=245515
<rdar://100257715>

Reviewed by Chris Dumez.

* Source/WebCore/Headers.cmake:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::attributionSourceNonceForPCM const):
(WebCore::HTMLAnchorElement::parsePrivateClickMeasurementForSKAdNetwork const):
(WebCore::HTMLAnchorElement::parsePrivateClickMeasurement const):
* Source/WebCore/html/HTMLAnchorElement.h:
* Source/WebCore/loader/AttributionSecondsUntilSendData.h: Added.
(WebCore::PCM::AttributionSecondsUntilSendData::hasValidSecondsUntilSendValues):
(WebCore::PCM::AttributionSecondsUntilSendData::minSecondsUntilSend):
(WebCore::PCM::AttributionSecondsUntilSendData::encode const):
(WebCore::PCM::AttributionSecondsUntilSendData::decode):
* Source/WebCore/loader/AttributionTimeToSendData.h: Added.
(WebCore::PCM::AttributionTimeToSendData::earliestTimeToSend):
(WebCore::PCM::AttributionTimeToSendData::latestTimeToSend):
(WebCore::PCM::AttributionTimeToSendData::attributionReportEndpoint):
* Source/WebCore/loader/AttributionTriggerData.cpp: Added.
(WebCore::PCM::AttributionTriggerData::tokenPublicKeyURL const):
(WebCore::PCM::AttributionTriggerData::tokenSignatureURL const):
* Source/WebCore/loader/AttributionTriggerData.h: Added.
(WebCore::PCM::AttributionTriggerData::Priority::Priority):
(WebCore::PCM::AttributionTriggerData::isValid const):
(WebCore::PCM::AttributionTriggerData::setDestinationUnlinkableTokenValue):
(WebCore::PCM::AttributionTriggerData::setDestinationSecretToken):
* Source/WebCore/loader/EphemeralNonce.h: Added.
(WebCore::PCM::EphemeralNonce::isolatedCopy const):
(WebCore::PCM::EphemeralNonce::isolatedCopy):
* Source/WebCore/loader/PCMSites.h: Added.
(WebCore::PCM::SourceSite::SourceSite):
(WebCore::PCM::SourceSite::isolatedCopy const):
(WebCore::PCM::SourceSite::isolatedCopy):
(WebCore::PCM::SourceSite::operator== const):
(WebCore::PCM::SourceSite::operator!= const):
(WebCore::PCM::SourceSite::matches const):
(WebCore::PCM::SourceSiteHash::hash):
(WebCore::PCM::SourceSiteHash::equal):
(WebCore::PCM::AttributionDestinationSite::AttributionDestinationSite):
(WebCore::PCM::AttributionDestinationSite::isolatedCopy const):
(WebCore::PCM::AttributionDestinationSite::isolatedCopy):
(WebCore::PCM::AttributionDestinationSite::operator== const):
(WebCore::PCM::AttributionDestinationSite::operator!= const):
(WebCore::PCM::AttributionDestinationSite::matches const):
(WebCore::PCM::AttributionDestinationSiteHash::hash):
(WebCore::PCM::AttributionDestinationSiteHash::equal):
(WTF::HashTraits<WebCore::PCM::SourceSite>::emptyValue):
(WTF::HashTraits<WebCore::PCM::SourceSite>::constructDeletedValue):
(WTF::HashTraits<WebCore::PCM::SourceSite>::isDeletedValue):
(WTF::HashTraits<WebCore::PCM::AttributionDestinationSite>::emptyValue):
(WTF::HashTraits<WebCore::PCM::AttributionDestinationSite>::constructDeletedValue):
(WTF::HashTraits<WebCore::PCM::AttributionDestinationSite>::isDeletedValue):
* Source/WebCore/loader/PCMTokens.h: Added.
(WebCore::PCM::SourceUnlinkableToken::isolatedCopy const):
(WebCore::PCM::SourceUnlinkableToken::isolatedCopy):
(WebCore::PCM::DestinationUnlinkableToken::isolatedCopy const):
(WebCore::PCM::DestinationUnlinkableToken::isolatedCopy):
(WebCore::PCM::SecretToken::isolatedCopy const):
(WebCore::PCM::SecretToken::isolatedCopy):
(WebCore::PCM::SourceSecretToken::isolatedCopy const):
(WebCore::PCM::SourceSecretToken::isolatedCopy):
(WebCore::PCM::DestinationSecretToken::isolatedCopy const):
(WebCore::PCM::DestinationSecretToken::isolatedCopy):
* Source/WebCore/loader/PrivateClickMeasurement.cpp:
(WebCore::PCM::UnlinkableToken::isolatedCopy const):
(WebCore::PCM::UnlinkableToken::isolatedCopy):
(WebCore::PrivateClickMeasurement::isNeitherSameSiteNorCrossSiteTriggeringEvent):
(WebCore::PrivateClickMeasurement::parseAttributionRequestQuery):
(WebCore::PrivateClickMeasurement::parseAttributionRequest):
(WebCore::PrivateClickMeasurement::attributeAndGetEarliestTimeToSend):
(WebCore::PrivateClickMeasurement::attributionReportJSON const):
(WebCore::PCM::EphemeralNonce::isValid const):
(WebCore::PrivateClickMeasurement::setEphemeralSourceNonce):
(WebCore::PCM::AttributionTriggerData::tokenSignatureJSON const):
(WebCore::PCM::SecretToken::isValid const):
(WebCore::PrivateClickMeasurement::setSourceSecretToken):
(WebCore::PrivateClickMeasurement::setDestinationSecretToken):
(WebCore::PrivateClickMeasurement::UnlinkableToken::isolatedCopy const): Deleted.
(WebCore::PrivateClickMeasurement::UnlinkableToken::isolatedCopy): Deleted.
(WebCore::PrivateClickMeasurement::EphemeralNonce::isValid const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTriggerData::tokenSignatureJSON const): Deleted.
(WebCore::PrivateClickMeasurement::SecretToken::isValid const): Deleted.
* Source/WebCore/loader/PrivateClickMeasurement.h:
(WebCore::PrivateClickMeasurement::PrivateClickMeasurement):
(WebCore::PrivateClickMeasurement::sourceSite const):
(WebCore::PrivateClickMeasurement::destinationSite const):
(WebCore::PrivateClickMeasurement::timesToSend const):
(WebCore::PrivateClickMeasurement::setTimesToSend):
(WebCore::PrivateClickMeasurement::attributionTriggerData const):
(WebCore::PrivateClickMeasurement::setAttribution):
(WebCore::PrivateClickMeasurement::isEphemeral const):
(WebCore::PrivateClickMeasurement::setEphemeral):
(WebCore::PrivateClickMeasurement::ephemeralSourceNonce const):
(WebCore::PrivateClickMeasurement::sourceUnlinkableToken):
(WebCore::PrivateClickMeasurement::sourceSecretToken const):
(WebCore::PrivateClickMeasurement::SourceID::SourceID): Deleted.
(WebCore::PrivateClickMeasurement::SourceSite::SourceSite): Deleted.
(WebCore::PrivateClickMeasurement::SourceSite::isolatedCopy const): Deleted.
(WebCore::PrivateClickMeasurement::SourceSite::isolatedCopy): Deleted.
(WebCore::PrivateClickMeasurement::SourceSite::operator== const): Deleted.
(WebCore::PrivateClickMeasurement::SourceSite::operator!= const): Deleted.
(WebCore::PrivateClickMeasurement::SourceSite::matches const): Deleted.
(WebCore::PrivateClickMeasurement::SourceSiteHash::hash): Deleted.
(WebCore::PrivateClickMeasurement::SourceSiteHash::equal): Deleted.
(WebCore::PrivateClickMeasurement::AttributionDestinationSite::AttributionDestinationSite): Deleted.
(WebCore::PrivateClickMeasurement::AttributionDestinationSite::isolatedCopy const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionDestinationSite::isolatedCopy): Deleted.
(WebCore::PrivateClickMeasurement::AttributionDestinationSite::operator== const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionDestinationSite::operator!= const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionDestinationSite::matches const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionDestinationSiteHash::hash): Deleted.
(WebCore::PrivateClickMeasurement::AttributionDestinationSiteHash::equal): Deleted.
(WebCore::PrivateClickMeasurement::Priority::Priority): Deleted.
(WebCore::PrivateClickMeasurement::EphemeralNonce::isolatedCopy const): Deleted.
(WebCore::PrivateClickMeasurement::EphemeralNonce::isolatedCopy): Deleted.
(WebCore::PrivateClickMeasurement::SourceUnlinkableToken::isolatedCopy const): Deleted.
(WebCore::PrivateClickMeasurement::SourceUnlinkableToken::isolatedCopy): Deleted.
(WebCore::PrivateClickMeasurement::DestinationUnlinkableToken::isolatedCopy const): Deleted.
(WebCore::PrivateClickMeasurement::DestinationUnlinkableToken::isolatedCopy): Deleted.
(WebCore::PrivateClickMeasurement::SecretToken::isolatedCopy const): Deleted.
(WebCore::PrivateClickMeasurement::SecretToken::isolatedCopy): Deleted.
(WebCore::PrivateClickMeasurement::SourceSecretToken::isolatedCopy const): Deleted.
(WebCore::PrivateClickMeasurement::SourceSecretToken::isolatedCopy): Deleted.
(WebCore::PrivateClickMeasurement::DestinationSecretToken::isolatedCopy const): Deleted.
(WebCore::PrivateClickMeasurement::DestinationSecretToken::isolatedCopy): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTriggerData::AttributionTriggerData): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTriggerData::isValid const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTriggerData::setDestinationUnlinkableTokenValue): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTriggerData::setDestinationSecretToken): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTriggerData::tokenPublicKeyURL const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTriggerData::tokenSignatureURL const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionSecondsUntilSendData::hasValidSecondsUntilSendValues): Deleted.
(WebCore::PrivateClickMeasurement::AttributionSecondsUntilSendData::minSecondsUntilSend): Deleted.
(WebCore::PrivateClickMeasurement::AttributionSecondsUntilSendData::encode const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionSecondsUntilSendData::decode): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTimeToSendData::earliestTimeToSend): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTimeToSendData::latestTimeToSend): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTimeToSendData::attributionReportEndpoint): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTimeToSendData::encode const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTimeToSendData::decode): Deleted.
(WebCore::PrivateClickMeasurement::encode const): Deleted.
(WebCore::PrivateClickMeasurement::decode): Deleted.
(WebCore::PrivateClickMeasurement::EphemeralNonce::encode const): Deleted.
(WebCore::PrivateClickMeasurement::EphemeralNonce::decode): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTriggerData::encode const): Deleted.
(WebCore::PrivateClickMeasurement::AttributionTriggerData::decode): Deleted.
(WTF::HashTraits<WebCore::PrivateClickMeasurement::SourceSite>::emptyValue): Deleted.
(WTF::HashTraits<WebCore::PrivateClickMeasurement::SourceSite>::constructDeletedValue): Deleted.
(WTF::HashTraits<WebCore::PrivateClickMeasurement::SourceSite>::isDeletedValue): Deleted.
(WTF::HashTraits<WebCore::PrivateClickMeasurement::AttributionDestinationSite>::emptyValue): Deleted.
(WTF::HashTraits<WebCore::PrivateClickMeasurement::AttributionDestinationSite>::constructDeletedValue): Deleted.
(WTF::HashTraits<WebCore::PrivateClickMeasurement::AttributionDestinationSite>::isDeletedValue): Deleted.
* Source/WebCore/loader/cocoa/PrivateClickMeasurementCocoa.mm:
(WebCore::PrivateClickMeasurement::calculateAndUpdateDestinationUnlinkableToken):
(WebCore::PrivateClickMeasurement::calculateAndUpdateUnlinkableToken):
(WebCore::PrivateClickMeasurement::calculateAndUpdateSourceSecretToken):
(WebCore::PrivateClickMeasurement::calculateAndUpdateDestinationSecretToken):
(WebCore::PrivateClickMeasurement::calculateAndUpdateSecretToken):
* Source/WebKit/NetworkProcess/DatabaseUtilities.cpp:
(WebKit::DatabaseUtilities::buildPrivateClickMeasurementFromDatabase const):
* Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::willSendRedirectedRequestInternal):
(WebKit::NetworkResourceLoader::continueWillSendRedirectedRequest):
* Source/WebKit/NetworkProcess/NetworkResourceLoader.h:
* Source/WebKit/NetworkProcess/NetworkSession.cpp:
(WebKit::NetworkSession::storePrivateClickMeasurement):
(WebKit::NetworkSession::handlePrivateClickMeasurementConversion):
* Source/WebKit/NetworkProcess/NetworkSession.h:
* Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp:
(WebKit::PCM::Database::insertPrivateClickMeasurement):
(WebKit::PCM::Database::findPrivateClickMeasurement):
(WebKit::PCM::Database::attributePrivateClickMeasurement):
(WebKit::PCM::Database::attributionToStringForTesting const):
(WebKit::PCM::Database::clearSentAttribution):
* Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.h:
* Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.cpp:
(WebKit::PrivateClickMeasurementManager::storeUnattributed):
(WebKit::PrivateClickMeasurementManager::getTokenPublicKey):
(WebKit::PrivateClickMeasurementManager::getSignedUnlinkableTokenForSource):
(WebKit::PrivateClickMeasurementManager::handleAttribution):
(WebKit::PrivateClickMeasurementManager::fireConversionRequest):
(WebKit::PrivateClickMeasurementManager::fireConversionRequestImpl):
(WebKit::PrivateClickMeasurementManager::clearSentAttribution):
(WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests):
* Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.h:
* Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerInterface.h:
* Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp:
(WebKit::PCM::ManagerProxy::handleAttribution):
* Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.h:
* Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.cpp:
(WebKit::PCM::Store::attributePrivateClickMeasurement):
(WebKit::PCM::Store::clearSentAttribution):
* Source/WebKit/NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.h:
* Source/WebKit/Platform/IPC/DaemonCoders.cpp:
(WebKit::Daemon::Coder<WebCore::PCM::SourceSite>::encode):
(WebKit::Daemon::Coder<WebCore::PCM::SourceSite>::decode):
(WebKit::Daemon::Coder<WebCore::PCM::AttributionDestinationSite>::encode):
(WebKit::Daemon::Coder<WebCore::PCM::AttributionDestinationSite>::decode):
(WebKit::Daemon::Coder<WebCore::PCM::EphemeralNonce>::encode):
(WebKit::Daemon::Coder<WebCore::PCM::EphemeralNonce>::decode):
(WebKit::Daemon::Coder<WebCore::PCM::AttributionTimeToSendData>::encode):
(WebKit::Daemon::Coder<WebCore::PCM::AttributionTimeToSendData>::decode):
(WebKit::Daemon::void>::encode):
(WebKit::Daemon::void>::decode):
* Source/WebKit/Platform/IPC/DaemonCoders.h:
* Source/WebKit/Scripts/generate-serializers.py:
(generate_header):
(generate_cpp):
(generate_serialized_type_info):
(parse_serialized_types):
* Source/WebKit/Scripts/webkit/tests/GeneratedSerializers.h:
* Source/WebKit/Scripts/webkit/tests/SerializedTypeInfo.cpp:
(WebKit::allSerializedEnums):
* Source/WebKit/Scripts/webkit/tests/TestSerializedType.serialization.in:
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm:
(-[WKWebView _addEventAttributionWithSourceID:destinationURL:sourceDescription:purchaser:reportEndpoint:optionalNonce:applicationBundleID:ephemeral:]):
* Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm:
(-[WKWebView _setUIEventAttribution:]):
(-[WKWebView _setEphemeralUIEventAttribution:forApplicationWithBundleID:]):
* Tools/TestWebKitAPI/Tests/WebCore/PrivateClickMeasurement.cpp:
(TestWebKitAPI::TEST):
* Tools/TestWebKitAPI/Tests/WebCore/cocoa/PrivateClickMeasurementCocoa.mm:
(TestWebKitAPI::TEST):

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

More information about the webkit-changes mailing list