Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (284215 => 284216)
--- trunk/Source/WebCore/CMakeLists.txt 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebCore/CMakeLists.txt 2021-10-14 23:55:58 UTC (rev 284216)
@@ -2220,6 +2220,23 @@
GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/XMLNames.cpp)
+list(APPEND WebCore_SOURCES
+ loader/PrivateClickMeasurement.cpp
+
+ platform/Logging.cpp
+ platform/MIMETypeRegistry.cpp
+ platform/RuntimeApplicationChecks.cpp
+
+ platform/network/HTTPHeaderMap.cpp
+ platform/network/HTTPHeaderValues.cpp
+
+ platform/sql/SQLiteDatabase.cpp
+ platform/sql/SQLiteDatabaseTracker.cpp
+ platform/sql/SQLiteStatement.cpp
+ platform/sql/SQLiteStatementAutoResetScope.cpp
+ platform/sql/SQLiteTransaction.cpp
+)
+
WEBKIT_COMPUTE_SOURCES(WebCore)
if (MSVC)
Modified: trunk/Source/WebCore/ChangeLog (284215 => 284216)
--- trunk/Source/WebCore/ChangeLog 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebCore/ChangeLog 2021-10-14 23:55:58 UTC (rev 284216)
@@ -1,5 +1,22 @@
2021-10-14 Alex Christensen <[email protected]>
+ Reduce memory use of AdAttributionDaemon
+ https://bugs.webkit.org/show_bug.cgi?id=231523
+
+ Reviewed by Brady Eidson.
+
+ This makes a new library, libWebCoreStatic.a, which contains the pieces of WebCore that adattributiond needs.
+ That way, adattributiond doesn't need to link to WebKit.framework, which greatly reduces its memory use and
+ puts it below the jetsam threshold.
+
+ * CMakeLists.txt:
+ * Configurations/WebCore.xcconfig:
+ * Sources.txt:
+ * SourcesCocoa.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+
+2021-10-14 Alex Christensen <[email protected]>
+
Remove Variant.h
https://bugs.webkit.org/show_bug.cgi?id=231744
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (284215 => 284216)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2021-10-14 23:55:58 UTC (rev 284216)
@@ -127,7 +127,7 @@
WK_URL_FORMATTING_LDFLAGS_YES = -framework URLFormatting;
// FIXME: Reduce the number of allowable_clients <rdar://problem/31823969>
-OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_ANGLE_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LD_FLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -force_load $(BUILT_PRODUCTS_DIR)/libWebCoreStatic.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_ANGLE_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LD_FLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS);
OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI;
OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella WebKit;
Modified: trunk/Source/WebCore/Sources.txt (284215 => 284216)
--- trunk/Source/WebCore/Sources.txt 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebCore/Sources.txt 2021-10-14 23:55:58 UTC (rev 284216)
@@ -1543,7 +1543,6 @@
layout/formattingContexts/table/TableFormattingState.cpp
layout/formattingContexts/table/TableGrid.cpp
layout/formattingContexts/table/TableLayout.cpp
-loader/PrivateClickMeasurement.cpp
loader/ApplicationManifestLoader.cpp
loader/CanvasActivityRecord.cpp
loader/ContentFilter.cpp
@@ -1818,9 +1817,7 @@
platform/LengthSize.cpp
platform/LocalizedStrings.cpp
platform/LogInitialization.cpp
-platform/Logging.cpp
platform/LowPowerModeNotifier.cpp
-platform/MIMETypeRegistry.cpp
platform/MainThreadSharedTimer.cpp
platform/MediaStrategy.cpp
platform/NotImplemented.cpp
@@ -1839,7 +1836,6 @@
platform/ProcessIdentifier.cpp
platform/ReferrerPolicy.cpp
platform/RemoteCommandListener.cpp
-platform/RuntimeApplicationChecks.cpp
platform/SSLKeyGenerator.cpp
platform/ScrollAnimation.cpp
platform/ScrollAnimationKinetic.cpp
@@ -2144,8 +2140,6 @@
platform/network/DataURLDecoder.cpp
platform/network/FormData.cpp
platform/network/FormDataBuilder.cpp
-platform/network/HTTPHeaderMap.cpp
-platform/network/HTTPHeaderValues.cpp
platform/network/HTTPParsers.cpp
platform/network/MIMEHeader.cpp
platform/network/NetworkLoadMetrics.cpp
@@ -2167,12 +2161,7 @@
platform/network/SynchronousLoaderClient.cpp
platform/network/TimingAllowOrigin.cpp
platform/sql/SQLiteAuthorizer.cpp
-platform/sql/SQLiteDatabase.cpp
-platform/sql/SQLiteDatabaseTracker.cpp
platform/sql/SQLiteFileSystem.cpp
-platform/sql/SQLiteStatement.cpp
-platform/sql/SQLiteStatementAutoResetScope.cpp
-platform/sql/SQLiteTransaction.cpp
platform/text/BidiContext.cpp
platform/text/DateTimeFormat.cpp
platform/text/EncodingTables.cpp
Modified: trunk/Source/WebCore/SourcesCocoa.txt (284215 => 284216)
--- trunk/Source/WebCore/SourcesCocoa.txt 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2021-10-14 23:55:58 UTC (rev 284216)
@@ -177,7 +177,6 @@
loader/archive/cf/LegacyWebArchive.cpp
loader/archive/cf/LegacyWebArchiveMac.mm
loader/cocoa/DiskCacheMonitorCocoa.mm
-loader/cocoa/PrivateClickMeasurementCocoa.mm
loader/cocoa/SubresourceLoaderCocoa.mm
loader/ios/LegacyPreviewLoader.mm
loader/mac/DocumentLoaderMac.cpp
@@ -489,7 +488,6 @@
platform/mac/PlaybackSessionInterfaceMac.mm @no-unify
platform/mac/PluginBlocklist.mm
platform/mac/PowerObserverMac.cpp
-platform/mac/PublicSuffixMac.mm
platform/mac/SSLKeyGeneratorMac.mm
platform/mac/ScrollAnimatorMac.mm @no-unify
platform/mac/ScrollAnimationRubberBand.mm
@@ -551,7 +549,6 @@
platform/mock/MediaPlaybackTargetMock.cpp
platform/mock/MediaPlaybackTargetPickerMock.cpp
platform/mock/MockAudioDestinationCocoa.cpp
-platform/network/cf/CertificateInfoCFNet.cpp
platform/network/cf/DNSResolveQueueCFNet.cpp
platform/network/cf/FormDataStreamCFNet.cpp
platform/network/cf/NetworkStorageSessionCFNet.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (284215 => 284216)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-10-14 23:55:58 UTC (rev 284216)
@@ -2018,6 +2018,20 @@
5B30695E18B3D3450099D5E8 /* WebGLDrawBuffers.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B30695B18B3D3450099D5E8 /* WebGLDrawBuffers.h */; };
5B46656325D14C0A000CFE14 /* ScrollingEffectsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B46655F25D14C09000CFE14 /* ScrollingEffectsController.h */; settings = {ATTRIBUTES = (Private, ); }; };
5B46656425D14C0A000CFE14 /* ScrollSnapAnimatorState.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B46656025D14C0A000CFE14 /* ScrollSnapAnimatorState.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 5C157974270E848300ED5280 /* PrivateClickMeasurement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B0A07F121FA4B5C00D57391 /* PrivateClickMeasurement.cpp */; };
+ 5C157976270E851300ED5280 /* PublicSuffixMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0081FEFE16B0A2B6008AAA7A /* PublicSuffixMac.mm */; };
+ 5C157977270E872A00ED5280 /* SQLiteStatement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2246450CC98DDB00C05240 /* SQLiteStatement.cpp */; };
+ 5C157978270E873400ED5280 /* SQLiteDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2246430CC98DDB00C05240 /* SQLiteDatabase.cpp */; };
+ 5C15797B270E886100ED5280 /* SQLiteStatementAutoResetScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBE5B227245A29CF003A5A88 /* SQLiteStatementAutoResetScope.cpp */; };
+ 5C15797C270E886E00ED5280 /* HTTPHeaderValues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41614A761DA64236004AD06F /* HTTPHeaderValues.cpp */; };
+ 5C15797D270E887D00ED5280 /* SQLiteTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2246470CC98DDB00C05240 /* SQLiteTransaction.cpp */; };
+ 5C15797E270E88C100ED5280 /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8239DFE09B3CF8A00B60641 /* Logging.cpp */; };
+ 5C15797F270E88E600ED5280 /* SQLiteDatabaseTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E474E1D12494DC900235364 /* SQLiteDatabaseTracker.cpp */; };
+ 5C157981270E892800ED5280 /* CertificateInfoCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5F2DBBE7178E332D00141486 /* CertificateInfoCFNet.cpp */; };
+ 5C157984270E89AF00ED5280 /* PrivateClickMeasurementCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57F1C8E325DC6EE700E8F6EA /* PrivateClickMeasurementCocoa.mm */; };
+ 5C157985270E89C400ED5280 /* HTTPHeaderMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0B8C56D30F28627F000502E1 /* HTTPHeaderMap.cpp */; };
+ 5C157986270E89D800ED5280 /* MIMETypeRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772C4C0C4EB3040083285F /* MIMETypeRegistry.cpp */; };
+ 5C157987270E89FB00ED5280 /* RuntimeApplicationChecks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A18F7A351ECA73640059E1E1 /* RuntimeApplicationChecks.cpp */; };
5C1B1D3F26F3978000882DA2 /* ResourceLoaderIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1B1D3D26F3977F00882DA2 /* ResourceLoaderIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
5C2B1AEC22397EBC00B91CF7 /* ResourceResponseCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1F78D0B1C25422C00245446 /* ResourceResponseCocoa.mm */; };
5C4304B1191AC908000E2BC0 /* EXTShaderTextureLOD.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4304AE191AC908000E2BC0 /* EXTShaderTextureLOD.h */; };
@@ -5704,6 +5718,20 @@
remoteGlobalIDString = 5355E8D11F967E9D0031E08C;
remoteInfo = "Generate Unified Sources";
};
+ 5C157971270E842C00ED5280 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 5C1578F6270E80DC00ED5280;
+ remoteInfo = WebCoreStatic;
+ };
+ 5C1579A12714F6A300ED5280 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = DD041FBE09D9DDBE0010AF2A;
+ remoteInfo = "Derived Sources";
+ };
DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -9834,6 +9862,7 @@
5B7AB9F62567DB7E006592D0 /* ScrollSnapOffsetsInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollSnapOffsetsInfo.cpp; sourceTree = "<group>"; };
5C001521250011000094AA93 /* TextCodecSingleByte.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecSingleByte.cpp; sourceTree = "<group>"; };
5C001523250011010094AA93 /* TextCodecSingleByte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCodecSingleByte.h; sourceTree = "<group>"; };
+ 5C157961270E80DC00ED5280 /* libWebCoreStatic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWebCoreStatic.a; sourceTree = BUILT_PRODUCTS_DIR; };
5C1B1D1E26F15B1900882DA2 /* SharedWorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedWorkerGlobalScope.cpp; sourceTree = "<group>"; };
5C1B1D2026F15B1A00882DA2 /* SharedWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedWorker.cpp; sourceTree = "<group>"; };
5C1B1D2126F15B1A00882DA2 /* SharedWorkerGlobalScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedWorkerGlobalScope.h; sourceTree = "<group>"; };
@@ -17403,6 +17432,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 5C157957270E80DC00ED5280 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
93F19B1208245E59001E9ABC /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -17450,6 +17486,7 @@
034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
+ 5C157961270E80DC00ED5280 /* libWebCoreStatic.a */,
E1BA67161742BDE000C20251 /* libWebCoreTestShim.dylib */,
417DA6D013734E02007C57FB /* libWebCoreTestSupport.dylib */,
93F19B1A08245E5A001E9ABC /* WebCore.framework */,
@@ -31559,6 +31596,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 5C1578F9270E80DC00ED5280 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
93F198A608245E59001E9ABC /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@@ -36344,6 +36388,24 @@
productReference = 417DA6D013734E02007C57FB /* libWebCoreTestSupport.dylib */;
productType = "com.apple.product-type.library.dynamic";
};
+ 5C1578F6270E80DC00ED5280 /* WebCoreStatic */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 5C15795D270E80DC00ED5280 /* Build configuration list for PBXNativeTarget "WebCoreStatic" */;
+ buildPhases = (
+ 5C1578F9270E80DC00ED5280 /* Headers */,
+ 5C157920270E80DC00ED5280 /* Sources */,
+ 5C157957270E80DC00ED5280 /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ 5C1579A22714F6A300ED5280 /* PBXTargetDependency */,
+ );
+ name = WebCoreStatic;
+ productName = WebCoreTestSupport;
+ productReference = 5C157961270E80DC00ED5280 /* libWebCoreStatic.a */;
+ productType = "com.apple.product-type.library.static";
+ };
93F198A508245E59001E9ABC /* WebCore */ = {
isa = PBXNativeTarget;
buildConfigurationList = 149C283908902B11008A9EFC /* Build configuration list for PBXNativeTarget "WebCore" */;
@@ -36367,6 +36429,7 @@
buildRules = (
);
dependencies = (
+ 5C157972270E842C00ED5280 /* PBXTargetDependency */,
1C09D0681E32079D00725F18 /* PBXTargetDependency */,
DD041FF109D9E3250010AF2A /* PBXTargetDependency */,
5355E8DB1F967ED30031E08C /* PBXTargetDependency */,
@@ -36443,6 +36506,7 @@
417DA6CF13734E02007C57FB /* WebCoreTestSupport */,
E1BA66F31742BDE000C20251 /* WebCoreTestShim */,
5325BDC621DFF33700A0DEE1 /* Apply Configuration to XCFileLists */,
+ 5C1578F6270E80DC00ED5280 /* WebCoreStatic */,
);
};
/* End PBXProject section */
@@ -36745,6 +36809,27 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 5C157920270E80DC00ED5280 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 5C157981270E892800ED5280 /* CertificateInfoCFNet.cpp in Sources */,
+ 5C157985270E89C400ED5280 /* HTTPHeaderMap.cpp in Sources */,
+ 5C15797C270E886E00ED5280 /* HTTPHeaderValues.cpp in Sources */,
+ 5C15797E270E88C100ED5280 /* Logging.cpp in Sources */,
+ 5C157986270E89D800ED5280 /* MIMETypeRegistry.cpp in Sources */,
+ 5C157974270E848300ED5280 /* PrivateClickMeasurement.cpp in Sources */,
+ 5C157984270E89AF00ED5280 /* PrivateClickMeasurementCocoa.mm in Sources */,
+ 5C157976270E851300ED5280 /* PublicSuffixMac.mm in Sources */,
+ 5C157987270E89FB00ED5280 /* RuntimeApplicationChecks.cpp in Sources */,
+ 5C157978270E873400ED5280 /* SQLiteDatabase.cpp in Sources */,
+ 5C15797F270E88E600ED5280 /* SQLiteDatabaseTracker.cpp in Sources */,
+ 5C157977270E872A00ED5280 /* SQLiteStatement.cpp in Sources */,
+ 5C15797B270E886100ED5280 /* SQLiteStatementAutoResetScope.cpp in Sources */,
+ 5C15797D270E887D00ED5280 /* SQLiteTransaction.cpp in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
93F19A0C08245E59001E9ABC /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -37499,6 +37584,16 @@
target = 5355E8D11F967E9D0031E08C /* Generate Unified Sources */;
targetProxy = 5355E8DA1F967ED30031E08C /* PBXContainerItemProxy */;
};
+ 5C157972270E842C00ED5280 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 5C1578F6270E80DC00ED5280 /* WebCoreStatic */;
+ targetProxy = 5C157971270E842C00ED5280 /* PBXContainerItemProxy */;
+ };
+ 5C1579A22714F6A300ED5280 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = DD041FBE09D9DDBE0010AF2A /* Derived Sources */;
+ targetProxy = 5C1579A12714F6A300ED5280 /* PBXContainerItemProxy */;
+ };
DD041FF109D9E3250010AF2A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DD041FBE09D9DDBE0010AF2A /* Derived Sources */;
@@ -37681,6 +37776,30 @@
};
name = Production;
};
+ 5C15795E270E80DC00ED5280 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */;
+ buildSettings = {
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Debug;
+ };
+ 5C15795F270E80DC00ED5280 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */;
+ buildSettings = {
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Release;
+ };
+ 5C157960270E80DC00ED5280 /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */;
+ buildSettings = {
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Production;
+ };
DD041FC209D9DDDC0010AF2A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
@@ -37789,6 +37908,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
+ 5C15795D270E80DC00ED5280 /* Build configuration list for PBXNativeTarget "WebCoreStatic" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 5C15795E270E80DC00ED5280 /* Debug */,
+ 5C15795F270E80DC00ED5280 /* Release */,
+ 5C157960270E80DC00ED5280 /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
DD041FC109D9DDDC0010AF2A /* Build configuration list for PBXAggregateTarget "Derived Sources" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Modified: trunk/Source/WebKit/ChangeLog (284215 => 284216)
--- trunk/Source/WebKit/ChangeLog 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebKit/ChangeLog 2021-10-14 23:55:58 UTC (rev 284216)
@@ -1,3 +1,21 @@
+2021-10-14 Alex Christensen <[email protected]>
+
+ Reduce memory use of AdAttributionDaemon
+ https://bugs.webkit.org/show_bug.cgi?id=231523
+
+ Reviewed by Brady Eidson.
+
+ * Configurations/adattributiond.xcconfig:
+ * Shared/API/Cocoa/WKMain.h:
+ * Shared/API/Cocoa/WKMain.mm:
+ (WKXPCServiceMain):
+ (WKPCMDaemonMain): Deleted.
+ * Shared/EntryPointUtilities/Cocoa/Daemon/adattributiond.cpp: Renamed from Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/adattributiond.c.
+ (main):
+ * Sources.txt:
+ * SourcesCocoa.txt:
+ * WebKit.xcodeproj/project.pbxproj:
+
2021-10-14 Yusuke Suzuki <[email protected]>
Fix build failures with newer clang
Modified: trunk/Source/WebKit/Configurations/adattributiond.xcconfig (284215 => 284216)
--- trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2021-10-14 23:55:58 UTC (rev 284216)
@@ -25,7 +25,7 @@
PRODUCT_NAME = adattributiond;
-OTHER_LDFLAGS = -framework WebKit;
+OTHER_LDFLAGS = -framework CFNetwork -framework Security -l WTF -l WebCoreStatic -l icucore -l sqlite3 -l PAL;
FRAMEWORK_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR);
WK_PROCESSED_XCENT_FILE=$(TEMP_FILE_DIR)/$(FULL_PRODUCT_NAME).entitlements
Modified: trunk/Source/WebKit/Shared/API/Cocoa/WKMain.h (284215 => 284216)
--- trunk/Source/WebKit/Shared/API/Cocoa/WKMain.h 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebKit/Shared/API/Cocoa/WKMain.h 2021-10-14 23:55:58 UTC (rev 284216)
@@ -33,7 +33,6 @@
#endif
WK_EXPORT int WKXPCServiceMain(int argc, const char** argv) WK_API_AVAILABLE(macos(10.15), ios(13.0));
-WK_EXPORT int WKPCMDaemonMain(int argc, const char** argv) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit/Shared/API/Cocoa/WKMain.mm (284215 => 284216)
--- trunk/Source/WebKit/Shared/API/Cocoa/WKMain.mm 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebKit/Shared/API/Cocoa/WKMain.mm 2021-10-14 23:55:58 UTC (rev 284216)
@@ -33,8 +33,3 @@
{
return WebKit::XPCServiceMain(argc, argv);
}
-
-int WKPCMDaemonMain(int argc, const char** argv)
-{
- return WebKit::PCMDaemonMain(argc, argv);
-}
Deleted: trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/adattributiond.c (284215 => 284216)
--- trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/adattributiond.c 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/adattributiond.c 2021-10-14 23:55:58 UTC (rev 284216)
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <os/availability.h>
-#include <WebKit/WKMain.h>
-
-int main(int argc, const char** argv)
-{
- WKPCMDaemonMain(argc, argv);
-}
Added: trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/adattributiond.cpp (0 => 284216)
--- trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/adattributiond.cpp (rev 0)
+++ trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/adattributiond.cpp 2021-10-14 23:55:58 UTC (rev 284216)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "PCMDaemonEntryPoint.h"
+
+int main(int argc, const char** argv)
+{
+ WebKit::PCMDaemonMain(argc, argv);
+}
Modified: trunk/Source/WebKit/Sources.txt (284215 => 284216)
--- trunk/Source/WebKit/Sources.txt 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebKit/Sources.txt 2021-10-14 23:55:58 UTC (rev 284216)
@@ -101,11 +101,9 @@
NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDatabase.cpp
NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDebugInfo.cpp
NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManager.cpp
-NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerInterface.cpp
NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementNetworkLoader.cpp
NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementStore.cpp
NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementConnection.cpp
-NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementDaemonClient.cpp
NetworkProcess/PrivateClickMeasurement/PrivateClickMeasurementManagerProxy.cpp
NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp @no-unify
Modified: trunk/Source/WebKit/SourcesCocoa.txt (284215 => 284216)
--- trunk/Source/WebKit/SourcesCocoa.txt 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2021-10-14 23:55:58 UTC (rev 284216)
@@ -195,9 +195,6 @@
Shared/Daemon/DaemonUtilities.mm
-Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonConnectionSet.mm
-Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonEntryPoint.mm
-
Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm
Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (284215 => 284216)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-10-14 23:55:58 UTC (rev 284216)
@@ -1277,6 +1277,24 @@
5C5D238C227A2CDA000B9BDA /* _WKCustomHeaderFields.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5D2389227A1892000B9BDA /* _WKCustomHeaderFields.h */; settings = {ATTRIBUTES = (Private, ); }; };
5C62FDF91EFC271C00CE072E /* WKURLSchemeTaskPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
5C66A4B52320962400EA4D44 /* WKHTTPCookieStoreRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C66A4B42320961400EA4D44 /* WKHTTPCookieStoreRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 5C6C813D2718BC2300D4FB42 /* PCMDaemonEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB9310526E837FD0032B1C0 /* PCMDaemonEntryPoint.mm */; };
+ 5C6C813E2718BC4000D4FB42 /* PCMDaemonConnectionSet.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C6289A927068EC000CF5EC6 /* PCMDaemonConnectionSet.mm */; };
+ 5C6C81412718C05000D4FB42 /* PrivateClickMeasurementManagerInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB9310626E839A90032B1C0 /* PrivateClickMeasurementManagerInterface.cpp */; };
+ 5C6C81422718C06C00D4FB42 /* ArgumentCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */; };
+ 5C6C81432718C07500D4FB42 /* DaemonDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1579E927172A8B00ED5280 /* DaemonDecoder.cpp */; };
+ 5C6C81442718C07A00D4FB42 /* DaemonEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1579E827172A8A00ED5280 /* DaemonEncoder.cpp */; };
+ 5C6C81452718C08C00D4FB42 /* PrivateClickMeasurementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD05864220CE8C2000BED5C /* PrivateClickMeasurementManager.cpp */; };
+ 5C6C81462718C09E00D4FB42 /* PrivateClickMeasurementDaemonClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB930F726E802150032B1C0 /* PrivateClickMeasurementDaemonClient.cpp */; };
+ 5C6C81472718C0D500D4FB42 /* PrivateClickMeasurementXPCUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB9310826E841CB0032B1C0 /* PrivateClickMeasurementXPCUtilities.mm */; };
+ 5C6C81482718C0E200D4FB42 /* PrivateClickMeasurementStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C826D6726D46B43008AEC91 /* PrivateClickMeasurementStore.cpp */; };
+ 5C6C81492718C0F000D4FB42 /* PrivateClickMeasurementDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C826D6A26D482EA008AEC91 /* PrivateClickMeasurementDatabase.cpp */; };
+ 5C6C814A2718C10700D4FB42 /* DatabaseUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C826D6E26D58A16008AEC91 /* DatabaseUtilities.cpp */; };
+ 5C6C814B2718C14000D4FB42 /* PrivateClickMeasurementNetworkLoaderCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB930F226E7EEE00032B1C0 /* PrivateClickMeasurementNetworkLoaderCocoa.mm */; };
+ 5C6C814C2718C16200D4FB42 /* PrivateClickMeasurementDebugInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CBE909026D7FB7C005A2E95 /* PrivateClickMeasurementDebugInfo.cpp */; };
+ 5C6C814D2718C16900D4FB42 /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A7F2F4125BF8D4008AEB1D /* Logging.cpp */; };
+ 5C6C814E2718C2F200D4FB42 /* NetworkDataTaskCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CBC9B8B1C65257300A8FDCF /* NetworkDataTaskCocoa.mm */; };
+ 5C6C814F2718C32000D4FB42 /* WebCoreArgumentCodersMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE23262122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm */; };
+ 5C6C81502718C33500D4FB42 /* ArgumentCodersCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF0C4912B16334008E49E2 /* ArgumentCodersCF.cpp */; };
5C6E7D882323620500C2159D /* WKWebsiteDataStoreConfigurationRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C6E7D86232361E700C2159D /* WKWebsiteDataStoreConfigurationRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
5C795D70229F373F003FF1C4 /* WKContextMenuElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE0C369229F2D4A003695F0 /* WKContextMenuElementInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE0C36A229F2D4A003695F0 /* WKContextMenuElementInfoPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1296,7 +1314,7 @@
5CABDC8622C40FDE001EDE8E /* WKMessageListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
5CABDC8722C40FED001EDE8E /* APIMessageListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CABDC8322C40FA7001EDE8E /* APIMessageListener.h */; };
5CADDE05215046BD0067D309 /* WKWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C74300E21500492004BFA17 /* WKWebProcess.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 5CAF7AA726F93AB00003F19E /* adattributiond.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* adattributiond.c */; };
+ 5CAF7AA726F93AB00003F19E /* adattributiond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* adattributiond.cpp */; };
5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE422130843500B1F7E1 /* _WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */; };
5CB6AE442609799C00B6ED5A /* ReasonSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB6AE432609799C00B6ED5A /* ReasonSPI.h */; };
@@ -4641,7 +4659,7 @@
5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageListener.h; sourceTree = "<group>"; };
5CADDE0D2151AA010067D309 /* AuthenticationChallengeDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeDisposition.h; sourceTree = "<group>"; };
5CAF7AA426F93A750003F19E /* adattributiond */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = adattributiond; sourceTree = BUILT_PRODUCTS_DIR; };
- 5CAF7AA526F93A950003F19E /* adattributiond.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = adattributiond.c; sourceTree = "<group>"; };
+ 5CAF7AA526F93A950003F19E /* adattributiond.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = adattributiond.cpp; sourceTree = "<group>"; };
5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = adattributiond.xcconfig; sourceTree = "<group>"; };
5CAFDE422130843500B1F7E1 /* _WKInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKInspector.h; sourceTree = "<group>"; };
5CAFDE432130843600B1F7E1 /* _WKInspector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKInspector.mm; sourceTree = "<group>"; };
@@ -9587,7 +9605,7 @@
5CB9310326E8375B0032B1C0 /* Daemon */ = {
isa = PBXGroup;
children = (
- 5CAF7AA526F93A950003F19E /* adattributiond.c */,
+ 5CAF7AA526F93A950003F19E /* adattributiond.cpp */,
5C1579F327179FD900ED5280 /* DaemonUtilities.h */,
5C1579F227179FD800ED5280 /* DaemonUtilities.mm */,
5C6289A827068EC000CF5EC6 /* PCMDaemonConnectionSet.h */,
@@ -14607,7 +14625,25 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 5CAF7AA726F93AB00003F19E /* adattributiond.c in Sources */,
+ 5CAF7AA726F93AB00003F19E /* adattributiond.cpp in Sources */,
+ 5C6C81422718C06C00D4FB42 /* ArgumentCoders.cpp in Sources */,
+ 5C6C81502718C33500D4FB42 /* ArgumentCodersCF.cpp in Sources */,
+ 5C6C81432718C07500D4FB42 /* DaemonDecoder.cpp in Sources */,
+ 5C6C81442718C07A00D4FB42 /* DaemonEncoder.cpp in Sources */,
+ 5C6C814A2718C10700D4FB42 /* DatabaseUtilities.cpp in Sources */,
+ 5C6C814D2718C16900D4FB42 /* Logging.cpp in Sources */,
+ 5C6C814E2718C2F200D4FB42 /* NetworkDataTaskCocoa.mm in Sources */,
+ 5C6C813E2718BC4000D4FB42 /* PCMDaemonConnectionSet.mm in Sources */,
+ 5C6C813D2718BC2300D4FB42 /* PCMDaemonEntryPoint.mm in Sources */,
+ 5C6C81462718C09E00D4FB42 /* PrivateClickMeasurementDaemonClient.cpp in Sources */,
+ 5C6C81492718C0F000D4FB42 /* PrivateClickMeasurementDatabase.cpp in Sources */,
+ 5C6C814C2718C16200D4FB42 /* PrivateClickMeasurementDebugInfo.cpp in Sources */,
+ 5C6C81452718C08C00D4FB42 /* PrivateClickMeasurementManager.cpp in Sources */,
+ 5C6C81412718C05000D4FB42 /* PrivateClickMeasurementManagerInterface.cpp in Sources */,
+ 5C6C814B2718C14000D4FB42 /* PrivateClickMeasurementNetworkLoaderCocoa.mm in Sources */,
+ 5C6C81482718C0E200D4FB42 /* PrivateClickMeasurementStore.cpp in Sources */,
+ 5C6C81472718C0D500D4FB42 /* PrivateClickMeasurementXPCUtilities.mm in Sources */,
+ 5C6C814F2718C32000D4FB42 /* WebCoreArgumentCodersMac.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Tools/ChangeLog (284215 => 284216)
--- trunk/Tools/ChangeLog 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Tools/ChangeLog 2021-10-14 23:55:58 UTC (rev 284216)
@@ -1,3 +1,13 @@
+2021-10-14 Alex Christensen <[email protected]>
+
+ Reduce memory use of AdAttributionDaemon
+ https://bugs.webkit.org/show_bug.cgi?id=231523
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:
+ (TestWebKitAPI::TEST):
+
2021-10-14 Yusuke Suzuki <[email protected]>
Fix build failures with newer clang
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm (284215 => 284216)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm 2021-10-14 23:48:32 UTC (rev 284215)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm 2021-10-14 23:55:58 UTC (rev 284216)
@@ -538,6 +538,7 @@
while (consoleMessages.size() < 2)
Util::spinRunLoop();
EXPECT_WK_STREQ(consoleMessages[1], "[Private Click Measurement] Turned Debug Mode off.");
+ cleanUpDaemon(tempDir);
}
TEST(PrivateClickMeasurement, NetworkProcessDebugMode)
