Changeset 290618 in webkit

Timestamp:

Feb 28, 2022 3:26:38 PM (2 years ago)

Author:

pvollan@apple.com

Message:

Remove release assert when UI process is blocking IOSurface IOKit access
​https://bugs.webkit.org/show_bug.cgi?id=237278

Reviewed by Darin Adler.

Remove release assert in IOSurface::bytesPerRowAlignment() when UI process is blocking IOSurface IOKit access.
Instead, log this event, and return an appropriate value.

• platform/graphics/cocoa/IOSurface.mm:

(WebCore::IOSurface::bytesPerRowAlignment):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/IOSurface.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-28  Per Arne Vollan  <pvollan@apple.com>
+
+        Remove release assert when UI process is blocking IOSurface IOKit access
+        https://bugs.webkit.org/show_bug.cgi?id=237278
+
+        Reviewed by Darin Adler.
+
+        Remove release assert in IOSurface::bytesPerRowAlignment() when UI process is blocking IOSurface IOKit access.
+        Instead, log this event, and return an appropriate value.
+
+        * platform/graphics/cocoa/IOSurface.mm:
+        (WebCore::IOSurface::bytesPerRowAlignment):
+
 2022-02-28  Chris Dumez  <cdumez@apple.com>
 

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

@@ -294 +294 @@
         // This likely means that the sandbox is blocking access to the IOSurface IOKit class,
         // and that IOSurface::bytesPerRowAlignment() has been called before IOSurface::setBytesPerRowAlignment.
-        RELEASE_ASSERT(alignment > 1);
+        if (alignment <= 1) {
+            RELEASE_LOG_FAULT(Layers, "Sandbox does not allow IOSurface IOKit access.");
+            // 64 bytes is currently the alignment on all platforms.
+            alignment = 64;
+        }
     }
     return alignment;