Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (295546 => 295547)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2022-06-15 00:53:02 UTC (rev 295546)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2022-06-15 01:13:06 UTC (rev 295547)
@@ -76,8 +76,6 @@
57F1C90A25DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57F1C90825DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm */; };
57FD318A22B3593E008D0E8B /* AppSSOSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57FD318922B3593E008D0E8B /* AppSSOSoftLink.mm */; };
5C7C787423AC3E770065F47E /* ManagedConfigurationSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C7C787223AC3E770065F47E /* ManagedConfigurationSoftLink.mm */; };
- 7B47F2A328587B9700E793C8 /* CoreGraphicsSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B47F2A128587B9700E793C8 /* CoreGraphicsSoftLink.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 7B47F2A428587B9700E793C8 /* CoreGraphicsSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B47F2A228587B9700E793C8 /* CoreGraphicsSoftLink.cpp */; };
93B38EC025821CD800198E63 /* SpeechSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B38EBF25821CD700198E63 /* SpeechSoftLink.mm */; };
A10826FA1F576292004772AC /* WebPanel.mm in Sources */ = {isa = PBXBuildFile; fileRef = A10826F81F576292004772AC /* WebPanel.mm */; };
A1175B4F1F6B337300C4B9F0 /* PopupMenu.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1175B4D1F6B337300C4B9F0 /* PopupMenu.mm */; };
@@ -888,8 +886,6 @@
71B1141F26823ACD004D6701 /* SystemPreviewSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemPreviewSPI.h; sourceTree = "<group>"; };
7A36D0F8223AD9AB00B0522E /* CommonCryptoSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonCryptoSPI.h; sourceTree = "<group>"; };
7A3A6A7F20CADB4600317AAE /* NSImageSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSImageSPI.h; sourceTree = "<group>"; };
- 7B47F2A128587B9700E793C8 /* CoreGraphicsSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreGraphicsSoftLink.h; sourceTree = "<group>"; };
- 7B47F2A228587B9700E793C8 /* CoreGraphicsSoftLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CoreGraphicsSoftLink.cpp; sourceTree = "<group>"; };
93468E662714A7CD009983E3 /* FilePortSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilePortSPI.h; sourceTree = "<group>"; };
93B38EBD25821CB600198E63 /* SpeechSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpeechSoftLink.h; sourceTree = "<group>"; };
93B38EBF25821CD700198E63 /* SpeechSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SpeechSoftLink.mm; sourceTree = "<group>"; };
@@ -1161,11 +1157,11 @@
0C7785831F45130F00F4EBB6 /* NSViewSPI.h */,
0C7785841F45130F00F4EBB6 /* NSWindowSPI.h */,
0C7785851F45130F00F4EBB6 /* PIPSPI.h */,
+ E34F26F52846B7550076E549 /* PowerLogSPI.h */,
0C7785871F45130F00F4EBB6 /* QuickLookMacSPI.h */,
07035D3027A9B32E00FB03E4 /* ScreenCaptureKitSPI.h */,
71B1141F26823ACD004D6701 /* SystemPreviewSPI.h */,
0C7785881F45130F00F4EBB6 /* TelephonyUtilitiesSPI.h */,
- E34F26F52846B7550076E549 /* PowerLogSPI.h */,
);
path = mac;
sourceTree = "<group>";
@@ -1211,7 +1207,6 @@
children = (
0C00CFCC1F68CE2300AAC26D /* avfoundation */,
0CF99CA51F73841C007EE793 /* cf */,
- 7B47F2A528587D6100E793C8 /* cg */,
1C4876DE1F8D831300CCEEBD /* cocoa */,
1C09D0511E31C41200725F18 /* crypto */,
1CC5E3C12737457D006F6FF4 /* graphics */,
@@ -1543,15 +1538,6 @@
path = mac;
sourceTree = "<group>";
};
- 7B47F2A528587D6100E793C8 /* cg */ = {
- isa = PBXGroup;
- children = (
- 7B47F2A228587B9700E793C8 /* CoreGraphicsSoftLink.cpp */,
- 7B47F2A128587B9700E793C8 /* CoreGraphicsSoftLink.h */,
- );
- path = cg;
- sourceTree = "<group>";
- };
A30D411D1F0DD0AC00B71954 /* text */ = {
isa = PBXGroup;
children = (
@@ -1686,7 +1672,6 @@
DD20DDE027BC90D70093D175 /* CommonCryptoSPI.h in Headers */,
DD20DE6527BC90F90093D175 /* config.h in Headers */,
DD20DDCE27BC90D70093D175 /* CoreAudioSPI.h in Headers */,
- 7B47F2A328587B9700E793C8 /* CoreGraphicsSoftLink.h in Headers */,
DD20DDD327BC90D70093D175 /* CoreGraphicsSPI.h in Headers */,
DD20DD1627BC90D60093D175 /* CoreMediaSoftLink.h in Headers */,
DD20DDCF27BC90D70093D175 /* CoreMediaSPI.h in Headers */,
@@ -1799,11 +1784,11 @@
DD20DE0327BC90D80093D175 /* PassKitSPI.h in Headers */,
DD20DE3E27BC90D80093D175 /* PIPSPI.h in Headers */,
DD20DE4527BC90D80093D175 /* PopupMenu.h in Headers */,
+ E34F26F62846D0D90076E549 /* PowerLogSPI.h in Headers */,
DD20DE0427BC90D80093D175 /* pthreadSPI.h in Headers */,
DD20DE0527BC90D80093D175 /* QuartzCoreSPI.h in Headers */,
DD20DE3F27BC90D80093D175 /* QuickLookMacSPI.h in Headers */,
DD20DDC127BC90D70093D175 /* QuickLookSoftLink.h in Headers */,
- E34F26F62846D0D90076E549 /* PowerLogSPI.h in Headers */,
DD20DE1827BC90D80093D175 /* QuickLookSPI.h in Headers */,
DD20DDC727BC90D70093D175 /* QuickLookUISoftLink.h in Headers */,
DD20DDC227BC90D70093D175 /* ReplayKitSoftLink.h in Headers */,
@@ -2104,7 +2089,6 @@
416E995323DAE6BE00E871CB /* AudioToolboxSoftLink.cpp in Sources */,
077E87B1226A460200A2AFF0 /* AVFoundationSoftLink.mm in Sources */,
1D2B413425F05E3500A3F70A /* ClockGeneric.cpp in Sources */,
- 7B47F2A428587B9700E793C8 /* CoreGraphicsSoftLink.cpp in Sources */,
0CF99CA81F738437007EE793 /* CoreMediaSoftLink.cpp in Sources */,
F47221F4276FC2EB00B984C7 /* CoreMLSoftLink.mm in Sources */,
1C77C8C925D7972000635E0C /* CoreTextSoftLink.cpp in Sources */,
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (295546 => 295547)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2022-06-15 00:53:02 UTC (rev 295546)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2022-06-15 01:13:06 UTC (rev 295547)
@@ -9,8 +9,6 @@
cf/OTSVGTable.h
cf/VideoToolboxSoftLink.h
- cg/CoreGraphicsSoftLink.h
-
cocoa/AppSSOSoftLink.h
cocoa/AVFoundationSoftLink.h
cocoa/CoreMLSoftLink.h
@@ -161,8 +159,6 @@
cf/OTSVGTable.cpp
cf/VideoToolboxSoftLink.cpp
- cg/CoreGraphicsSoftLink.cpp
-
cocoa/AppSSOSoftLink.mm
cocoa/AVFoundationSoftLink.mm
cocoa/CoreMLSoftLink.mm
Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h (295546 => 295547)
--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2022-06-15 00:53:02 UTC (rev 295546)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2022-06-15 01:13:06 UTC (rev 295547)
@@ -29,7 +29,6 @@
#include "DestinationColorSpace.h"
#include "IntSize.h"
-#include "ProcessIdentity.h"
#include <objc/objc.h>
#include <pal/spi/cocoa/IOSurfaceSPI.h>
@@ -47,6 +46,7 @@
class GraphicsContext;
class HostWindow;
class IOSurfacePool;
+class ProcessIdentity;
enum class PixelFormat : uint8_t;
enum class SetNonVolatileResult : uint8_t;
@@ -172,7 +172,6 @@
IntSize m_size;
size_t m_totalBytes;
- ProcessIdentity m_resourceOwner;
std::unique_ptr<GraphicsContext> m_graphicsContext;
RetainPtr<CGContextRef> m_cgContext;
Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (295546 => 295547)
--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2022-06-15 00:53:02 UTC (rev 295546)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2022-06-15 01:13:06 UTC (rev 295547)
@@ -40,7 +40,6 @@
#import <wtf/text/TextStream.h>
#import "CoreVideoSoftLink.h"
-#import <pal/cg/CoreGraphicsSoftLink.h>
namespace WebCore {
@@ -349,10 +348,7 @@
#else
UNUSED_PARAM(hostWindow);
#endif
-#if HAVE(CG_CONTEXT_SET_OWNER_IDENTITY)
- if (m_resourceOwner && CGContextSetOwnerIdentity)
- CGContextSetOwnerIdentity(m_cgContext.get(), m_resourceOwner.taskIdToken());
-#endif
+
return m_cgContext.get();
}
@@ -508,13 +504,7 @@
void IOSurface::setOwnershipIdentity(const ProcessIdentity& resourceOwner)
{
- ASSERT(resourceOwner);
- m_resourceOwner = resourceOwner;
setOwnershipIdentity(m_surface.get(), resourceOwner);
-#if HAVE(CG_CONTEXT_SET_OWNER_IDENTITY)
- if (m_cgContext && CGContextSetOwnerIdentity)
- CGContextSetOwnerIdentity(m_cgContext.get(), m_resourceOwner.taskIdToken());
-#endif
}
void IOSurface::setOwnershipIdentity(IOSurfaceRef surface, const ProcessIdentity& resourceOwner)
