Diff
Modified: trunk/Source/WebCore/ChangeLog (291301 => 291302)
--- trunk/Source/WebCore/ChangeLog 2022-03-15 17:24:09 UTC (rev 291301)
+++ trunk/Source/WebCore/ChangeLog 2022-03-15 17:31:04 UTC (rev 291302)
@@ -1,3 +1,21 @@
+2022-03-15 Alex Christensen <achristen...@webkit.org>
+
+ Stop using DYLD_INTERPOSE
+ https://bugs.webkit.org/show_bug.cgi?id=237867
+
+ Reviewed by Anders Carlsson.
+
+ It never worked on iOS, and it doesn't work on M1 Macs.
+ It used to be used for NPAPI and the SecItemShim,
+ but those have been removed and updated to use other methods that work on M1 Macs.
+ It is currently only used for tests in editing/secure-input which continue to pass
+ as much as they did before this change.
+
+ * Configurations/WebCoreTestShim.xcconfig: Removed.
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/mac/DynamicLinkerInterposing.h: Removed.
+ * testing/WebCoreTestShimLibrary.cpp: Removed.
+
2022-03-15 Antoine Quint <grao...@webkit.org>
[model] model-element/model-element-camera.html is a failure
Deleted: trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig (291301 => 291302)
--- trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2022-03-15 17:24:09 UTC (rev 291301)
+++ trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2022-03-15 17:31:04 UTC (rev 291302)
@@ -1,50 +0,0 @@
-// Copyright (C) 2013, 2014 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. ``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
-// 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 "WebCore.xcconfig"
-
-INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION));
-INSTALL_PATH_Production = $(INSTALL_PATH_Production_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR))
-INSTALL_PATH_Production_NO = /usr/local/lib;
-INSTALL_PATH_Production_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/lib;
-
-SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
-SKIP_INSTALL_ = YES;
-SKIP_INSTALL_NO = YES;
-SKIP_INSTALL_YES = NO;
-
-DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(CONFIGURATION));
-DYLIB_INSTALL_NAME_BASE_Production = $(INSTALL_PATH);
-DYLIB_INSTALL_NAME_BASE_Debug = @rpath;
-DYLIB_INSTALL_NAME_BASE_Release = $(DYLIB_INSTALL_NAME_BASE_Debug);
-
-PRODUCT_NAME = WebCoreTestShim;
-EXECUTABLE_PREFIX = lib;
-EXPORTED_SYMBOLS_FILE = ;
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-OTHER_LDFLAGS[sdk=macosx*] = $(ASAN_OTHER_LDFLAGS) -framework Carbon;
-
-ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
-ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
-ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
-ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (291301 => 291302)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2022-03-15 17:24:09 UTC (rev 291301)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2022-03-15 17:31:04 UTC (rev 291302)
@@ -15,7 +15,6 @@
dependencies = (
41816F8313859C7A0057AAA4 /* PBXTargetDependency */,
41816F8513859C7D0057AAA4 /* PBXTargetDependency */,
- E1BA671C1742CBF800C20251 /* PBXTargetDependency */,
);
name = All;
productName = All;
@@ -5217,8 +5216,6 @@
E1ADEDDA0E76BD93004A1A5E /* JSMessagePort.h in Headers */ = {isa = PBXBuildFile; fileRef = E1ADEDD80E76BD93004A1A5E /* JSMessagePort.h */; };
E1B25107152A0BB00069B779 /* StylePropertyShorthand.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B25105152A0BAF0069B779 /* StylePropertyShorthand.h */; };
E1B533491717DEE300F205F9 /* CachedRawResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B533481717DEE300F205F9 /* CachedRawResourceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
- E1BA66F11742BD8600C20251 /* DynamicLinkerInterposing.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BA66F01742BD8600C20251 /* DynamicLinkerInterposing.h */; settings = {ATTRIBUTES = (Private, ); }; };
- E1BA671A1742BEF400C20251 /* WebCoreTestShimLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1BA67191742BEF400C20251 /* WebCoreTestShimLibrary.cpp */; };
E1BD331A182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BD3318182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h */; };
E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BE512C0CF6C512002EA959 /* XSLTUnicodeSort.h */; };
E1C1A39E2480080800E0AF66 /* PlatformXROpenXR.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C1A39C2480080700E0AF66 /* PlatformXROpenXR.h */; };
@@ -5822,20 +5819,6 @@
remoteGlobalIDString = DD041FBE09D9DDBE0010AF2A;
remoteInfo = "Derived Sources";
};
- E1BA66F51742BDE000C20251 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 93F198A508245E59001E9ABC;
- remoteInfo = WebCore;
- };
- E1BA671B1742CBF800C20251 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = E1BA66F31742BDE000C20251;
- remoteInfo = WebCoreTestShim;
- };
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -17206,10 +17189,6 @@
E1B533461717D0A000F205F9 /* CachedSVGDocumentReference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedSVGDocumentReference.cpp; sourceTree = "<group>"; };
E1B533481717DEE300F205F9 /* CachedRawResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedRawResourceClient.h; sourceTree = "<group>"; };
E1BA003016FB92AC00BA7A35 /* ResourceHandleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleClient.cpp; sourceTree = "<group>"; };
- E1BA66F01742BD8600C20251 /* DynamicLinkerInterposing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerInterposing.h; sourceTree = "<group>"; };
- E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebCoreTestShim.xcconfig; sourceTree = "<group>"; };
- E1BA67161742BDE000C20251 /* libWebCoreTestShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libWebCoreTestShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
- E1BA67191742BEF400C20251 /* WebCoreTestShimLibrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreTestShimLibrary.cpp; sourceTree = "<group>"; };
E1BB84AC1822CA7400525043 /* CryptoAlgorithmRegistryMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRegistryMac.cpp; sourceTree = "<group>"; };
E1BD3317182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp; sourceTree = "<group>"; };
E1BD3318182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRSASSA_PKCS1_v1_5.h; sourceTree = "<group>"; };
@@ -18384,13 +18363,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- E1BA670E1742BDE000C20251 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -18411,7 +18383,6 @@
034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
- E1BA67161742BDE000C20251 /* libWebCoreTestShim.dylib */,
417DA6D013734E02007C57FB /* libWebCoreTestSupport.dylib */,
93F19B1A08245E5A001E9ABC /* WebCore.framework */,
);
@@ -20490,7 +20461,6 @@
A1B89B8D221E01EF00EB4CEA /* SDKVariant.xcconfig */,
1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */,
1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */,
- E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */,
4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */,
37119A7920CCB610002C6DC9 /* WebKitTargetConditionals.xcconfig */,
);
@@ -21217,7 +21187,6 @@
41D41C652256859200697942 /* ServiceWorkerInternals.mm */,
EB081CD81696084400553730 /* TypeConversions.h */,
EB081CD91696084400553730 /* TypeConversions.idl */,
- E1BA67191742BEF400C20251 /* WebCoreTestShimLibrary.cpp */,
E18D83E9243F71D3009247D6 /* WebFakeXRDevice.cpp */,
E18D83ED243F71D6009247D6 /* WebFakeXRDevice.h */,
E18D83E7243F71D2009247D6 /* WebFakeXRDevice.idl */,
@@ -23992,7 +23961,6 @@
F58784F002DE375901EA4122 /* CursorMac.mm */,
F4B2A90626502BA0009E7286 /* DataDetectorHighlight.h */,
F4B2A90826502BC0009E7286 /* DataDetectorHighlight.mm */,
- E1BA66F01742BD8600C20251 /* DynamicLinkerInterposing.h */,
510A91E524CFCC1800BFD89C /* HIDDevice.cpp */,
510A91E224CFCC1800BFD89C /* HIDDevice.h */,
510A91E424CFCC1800BFD89C /* HIDElement.cpp */,
@@ -34486,7 +34454,6 @@
BC2B41312734A08600A2D191 /* DummyModelPlayerProvider.h in Headers */,
93D6B7A82551D41F0058DD3A /* DummySpeechRecognitionProvider.h in Headers */,
93085DF826E822C7000EC6A7 /* DummyStorageProvider.h in Headers */,
- E1BA66F11742BD8600C20251 /* DynamicLinkerInterposing.h in Headers */,
FD6ED2C8136B8E66003CF072 /* DynamicsCompressor.h in Headers */,
FD537357137B653B00008DCE /* DynamicsCompressorKernel.h in Headers */,
FD6ED2C4136B8E42003CF072 /* DynamicsCompressorNode.h in Headers */,
@@ -38308,13 +38275,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- E1BA66F61742BDE000C20251 /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
@@ -38371,24 +38331,6 @@
productReference = 93F19B1A08245E5A001E9ABC /* WebCore.framework */;
productType = "com.apple.product-type.framework";
};
- E1BA66F31742BDE000C20251 /* WebCoreTestShim */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = E1BA67121742BDE000C20251 /* Build configuration list for PBXNativeTarget "WebCoreTestShim" */;
- buildPhases = (
- E1BA66F61742BDE000C20251 /* Headers */,
- E1BA67021742BDE000C20251 /* Sources */,
- E1BA670E1742BDE000C20251 /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- E1BA66F41742BDE000C20251 /* PBXTargetDependency */,
- );
- name = WebCoreTestShim;
- productName = WebCoreTestSupport;
- productReference = E1BA67161742BDE000C20251 /* libWebCoreTestShim.dylib */;
- productType = "com.apple.product-type.library.dynamic";
- };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -38435,7 +38377,6 @@
5355E8D11F967E9D0031E08C /* Generate Unified Sources */,
DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
417DA6CF13734E02007C57FB /* WebCoreTestSupport */,
- E1BA66F31742BDE000C20251 /* WebCoreTestShim */,
5325BDC621DFF33700A0DEE1 /* Apply Configuration to XCFileLists */,
);
};
@@ -39522,14 +39463,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- E1BA67021742BDE000C20251 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- E1BA671A1742BEF400C20251 /* WebCoreTestShimLibrary.cpp in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@@ -39563,16 +39496,6 @@
target = DD041FBE09D9DDBE0010AF2A /* Derived Sources */;
targetProxy = DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */;
};
- E1BA66F41742BDE000C20251 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 93F198A508245E59001E9ABC /* WebCore */;
- targetProxy = E1BA66F51742BDE000C20251 /* PBXContainerItemProxy */;
- };
- E1BA671C1742CBF800C20251 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = E1BA66F31742BDE000C20251 /* WebCoreTestShim */;
- targetProxy = E1BA671B1742CBF800C20251 /* PBXContainerItemProxy */;
- };
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
@@ -39764,27 +39687,6 @@
};
name = Production;
};
- E1BA67131742BDE000C20251 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */;
- buildSettings = {
- };
- name = Debug;
- };
- E1BA67141742BDE000C20251 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */;
- buildSettings = {
- };
- name = Release;
- };
- E1BA67151742BDE000C20251 /* Production */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */;
- buildSettings = {
- };
- name = Production;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -39858,16 +39760,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
- E1BA67121742BDE000C20251 /* Build configuration list for PBXNativeTarget "WebCoreTestShim" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- E1BA67131742BDE000C20251 /* Debug */,
- E1BA67141742BDE000C20251 /* Release */,
- E1BA67151742BDE000C20251 /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
/* End XCConfigurationList section */
};
rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
Deleted: trunk/Source/WebCore/platform/mac/DynamicLinkerInterposing.h (291301 => 291302)
--- trunk/Source/WebCore/platform/mac/DynamicLinkerInterposing.h 2022-03-15 17:24:09 UTC (rev 291301)
+++ trunk/Source/WebCore/platform/mac/DynamicLinkerInterposing.h 2022-03-15 17:31:04 UTC (rev 291302)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-
-#ifndef DyldInterpose_h
-#define DyldInterpose_h
-
-#ifdef DYLD_INTERPOSE
-#undef DYLD_INTERPOSE
-#endif
-
-#define DYLD_INTERPOSE(_replacement, _replacee) \
- __attribute__((used)) static struct { \
- const void* replacement; \
- const void* replacee; \
- } _interpose_##_replacee \
- __attribute__((section("__DATA,__interpose"))) = { \
- (const void*)(unsigned long)&_replacement, \
- (const void*)(unsigned long)&_replacee \
- }; \
-
-#endif // DyldInterpose_h
Deleted: trunk/Source/WebCore/testing/WebCoreTestShimLibrary.cpp (291301 => 291302)
--- trunk/Source/WebCore/testing/WebCoreTestShimLibrary.cpp 2022-03-15 17:24:09 UTC (rev 291301)
+++ trunk/Source/WebCore/testing/WebCoreTestShimLibrary.cpp 2022-03-15 17:31:04 UTC (rev 291302)
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2013 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 <TargetConditionals.h>
-
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-
-#include "DynamicLinkerInterposing.h"
-#include <Carbon/Carbon.h>
-
-static int sSecureInputEnableCount;
-
-static OSStatus shimEnableSecureEventInput()
-{
- ++sSecureInputEnableCount;
- return noErr;
-}
-
-static OSStatus shimDisableSecureEventInput()
-{
- if (!sSecureInputEnableCount)
- return paramErr;
- --sSecureInputEnableCount;
- return noErr;
-}
-
-static Boolean shimIsSecureEventInputEnabled()
-{
- return sSecureInputEnableCount;
-}
-
-DYLD_INTERPOSE(shimEnableSecureEventInput, EnableSecureEventInput)
-DYLD_INTERPOSE(shimDisableSecureEventInput, DisableSecureEventInput)
-DYLD_INTERPOSE(shimIsSecureEventInputEnabled, IsSecureEventInputEnabled)
-
-#endif // !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
Modified: trunk/Tools/ChangeLog (291301 => 291302)
--- trunk/Tools/ChangeLog 2022-03-15 17:24:09 UTC (rev 291301)
+++ trunk/Tools/ChangeLog 2022-03-15 17:31:04 UTC (rev 291302)
@@ -1,3 +1,15 @@
+2022-03-15 Alex Christensen <achristen...@webkit.org>
+
+ Stop using DYLD_INTERPOSE
+ https://bugs.webkit.org/show_bug.cgi?id=237867
+
+ Reviewed by Anders Carlsson.
+
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.setup_environ_for_server):
+ * Scripts/webkitpy/port/mac_unittest.py:
+ (MacTest.test_setup_environ_for_server):
+
2022-03-14 Jonathan Bedard <jbed...@apple.com>
[Merge-Queue] Fail draft PRs
Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (291301 => 291302)
--- trunk/Tools/Scripts/webkitpy/port/mac.py 2022-03-15 17:24:09 UTC (rev 291301)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2022-03-15 17:31:04 UTC (rev 291302)
@@ -185,7 +185,6 @@
if self.get_option('guard_malloc'):
self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
- self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
return env
Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (291301 => 291302)
--- trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2022-03-15 17:24:09 UTC (rev 291301)
+++ trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2022-03-15 17:31:04 UTC (rev 291302)
@@ -88,7 +88,7 @@
env = port.setup_environ_for_server(port.driver_name())
self.assertEqual(env['MallocStackLogging'], '1')
self.assertEqual(env['MallocScribble'], '1')
- self.assertEqual(env['DYLD_INSERT_LIBRARIES'], '/usr/lib/libgmalloc.dylib:/mock-build/libWebCoreTestShim.dylib')
+ self.assertEqual(env['DYLD_INSERT_LIBRARIES'], '/usr/lib/libgmalloc.dylib')
def test_show_results_html_file(self):
port = self.make_port()
