Title: [283483] trunk/Source/WebCore
Revision
283483
Author
[email protected]
Date
2021-10-03 16:03:35 -0700 (Sun, 03 Oct 2021)

Log 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).

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (283482 => 283483)


--- trunk/Source/WebCore/ChangeLog	2021-10-03 23:00:17 UTC (rev 283482)
+++ trunk/Source/WebCore/ChangeLog	2021-10-03 23:03:35 UTC (rev 283483)
@@ -1,3 +1,15 @@
+2021-10-03  David Kilzer  <[email protected]>
+
+        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  <[email protected]>
 
         Non-unified build fixes, early October 2021 edition

Modified: trunk/Source/WebCore/PAL/ChangeLog (283482 => 283483)


--- trunk/Source/WebCore/PAL/ChangeLog	2021-10-03 23:00:17 UTC (rev 283482)
+++ trunk/Source/WebCore/PAL/ChangeLog	2021-10-03 23:03:35 UTC (rev 283483)
@@ -1,5 +1,18 @@
 2021-10-03  David Kilzer  <[email protected]>
 
+        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  <[email protected]>
+
         Build fix: GPU Process microphone attribution SPI adoption
         <https://bugs.webkit.org/show_bug.cgi?id=231034>
         <rdar://problem/83732537>

Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h (283482 => 283483)


--- trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h	2021-10-03 23:00:17 UTC (rev 283482)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h	2021-10-03 23:03:35 UTC (rev 283483)
@@ -90,7 +90,7 @@
 
 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,
     kIOSurfaceMemoryLedgerTagNetwork     = 0x00000002,
@@ -98,9 +98,11 @@
     kIOSurfaceMemoryLedgerTagGraphics    = 0x00000004,
     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)
 kern_return_t IOSurfaceSetOwnershipIdentity(IOSurfaceRef buffer, mach_port_t task_id_token, int newLedgerTag, uint32_t newLedgerOptions);

Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (283482 => 283483)


--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm	2021-10-03 23:00:17 UTC (rev 283482)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm	2021-10-03 23:03:35 UTC (rev 283483)
@@ -35,7 +35,6 @@
 #import "Logging.h"
 #import "PlatformScreen.h"
 #import <pal/spi/cg/CoreGraphicsSPI.h>
-#import <pal/spi/cocoa/IOSurfaceSPI.h>
 #import <wtf/Assertions.h>
 #import <wtf/MachSendRight.h>
 #import <wtf/MathExtras.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to