Changeset 283483 in webkit

Timestamp:

Oct 3, 2021, 4:03:35 PM (5 years ago)

Author:

ddkilzer@apple.com

Message:

Build fix: Attribute IOSurfaces created by camera and decoders to responsible WebProcess
<​https://bugs.webkit.org/show_bug.cgi?id=231075>
<rdar://problem/83767168>

Unreviewed build fix.

Source/WebCore:

• platform/graphics/cocoa/IOSurface.mm:
• Remove IOSurfaceSPI.h header already included by IOSurface.h. This should force this source file to be rebuilt as well.

Source/WebCore/PAL:

• pal/spi/cocoa/IOSurfaceSPI.h:

(IOSurfaceMemoryLedgerTags):

• Define enums for both HAVE(IOSURFACE_SET_OWNERSHIP) and HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY).

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PAL/ChangeLog (modified) (1 diff)
• PAL/pal/spi/cocoa/IOSurfaceSPI.h (modified) (2 diffs)
• platform/graphics/cocoa/IOSurface.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-03  David Kilzer  <ddkilzer@apple.com>
+
+        Build fix: Attribute IOSurfaces created by camera and decoders to responsible WebProcess
+        <https://bugs.webkit.org/show_bug.cgi?id=231075>
+        <rdar://problem/83767168>
+
+        Unreviewed build fix.
+
+        * platform/graphics/cocoa/IOSurface.mm:
+        - Remove IOSurfaceSPI.h header already included by IOSurface.h.
+          This should force this source file to be rebuilt as well.
+
 2021-10-03  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-10-03  David Kilzer  <ddkilzer@apple.com>
+
+        Build fix: Attribute IOSurfaces created by camera and decoders to responsible WebProcess
+        <https://bugs.webkit.org/show_bug.cgi?id=231075>
+        <rdar://problem/83767168>
+
+        Unreviewed build fix.
+
+        * pal/spi/cocoa/IOSurfaceSPI.h:
+        (IOSurfaceMemoryLedgerTags):
+        - Define enums for both HAVE(IOSURFACE_SET_OWNERSHIP)
+          and HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY).
+
 2021-10-03  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h

@@ -91 +91 @@
 WTF_EXTERN_C_BEGIN
 
-#if HAVE(IOSURFACE_SET_OWNERSHIP)
+#if HAVE(IOSURFACE_SET_OWNERSHIP) || HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
 typedef CF_ENUM(int, IOSurfaceMemoryLedgerTags) {
     kIOSurfaceMemoryLedgerTagDefault     = 0x00000001,
@@ -99 +99 @@
     kIOSurfaceMemoryLedgerTagNeural      = 0x00000005,
 };
+#endif
 
+#if HAVE(IOSURFACE_SET_OWNERSHIP)
 IOReturn IOSurfaceSetOwnership(IOSurfaceRef buffer, task_t newOwner, int newLedgerTag, uint32_t newLedgerOptions);
-#endif // HAVE(IOSURFACE_SET_OWNERSHIP)
+#endif
 
 #if HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)

trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm

@@ -36 +36 @@
 #import "PlatformScreen.h"
 #import <pal/spi/cg/CoreGraphicsSPI.h>
-#import <pal/spi/cocoa/IOSurfaceSPI.h>
 #import <wtf/Assertions.h>
 #import <wtf/MachSendRight.h>