Changeset 281661 in webkit

Timestamp:

Aug 26, 2021, 3:07:30 PM (5 years ago)

Author:

Cameron McCormack

Message:

Manually release SharedBitmap if CGBitmapContextCreateWithData fails and doesn't do it
​https://bugs.webkit.org/show_bug.cgi?id=229428
<rdar://problem/82264138>

Reviewed by Darin Adler.

• Shared/ShareableBitmap.h:
• Shared/cg/ShareableBitmapCG.cpp:

(WebKit::ShareableBitmap::createGraphicsContext):
(WebKit::ShareableBitmap::releaseBitmapContextData):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/ShareableBitmap.h (modified) (1 diff)
• Shared/cg/ShareableBitmapCG.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-26  Cameron McCormack  <heycam@apple.com>
+
+        Manually release SharedBitmap if CGBitmapContextCreateWithData fails and doesn't do it
+        https://bugs.webkit.org/show_bug.cgi?id=229428
+        <rdar://problem/82264138>
+
+        Reviewed by Darin Adler.
+
+        * Shared/ShareableBitmap.h:
+        * Shared/cg/ShareableBitmapCG.cpp:
+        (WebKit::ShareableBitmap::createGraphicsContext):
+        (WebKit::ShareableBitmap::releaseBitmapContextData):
+
 2021-08-26  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebKit/Shared/ShareableBitmap.h

@@ -177 +177 @@
 #endif
 
+#if USE(CG)
+    bool m_releaseBitmapContextDataCalled { false };
+#endif
+
     // If the shareable bitmap is backed by shared memory, this points to the shared memory object.
     RefPtr<SharedMemory> m_sharedMemory;

trunk/Source/WebKit/Shared/cg/ShareableBitmapCG.cpp

@@ -98 +98 @@
         return nullptr;
 
+    ref(); // Balanced by deref in releaseBitmapContextData.
+
+    m_releaseBitmapContextDataCalled = false;
     RetainPtr<CGContextRef> bitmapContext = adoptCF(CGBitmapContextCreateWithData(data(), m_size.width(), m_size.height(), bitsPerComponent, bytesPerRow, colorSpace(m_configuration), bitmapInfo(m_configuration), releaseBitmapContextData, this));
-    if (!bitmapContext)
-        return nullptr;
-
-    ref(); // Balanced by deref in releaseBitmapContextData.
+    if (!bitmapContext) {
+        // When CGBitmapContextCreateWithData fails and returns null, it will only
+        // call the release callback in some circumstances <rdar://82228446>. We
+        // work around this by recording whether it was called, and calling it
+        // ourselves if needed.
+        if (!m_releaseBitmapContextDataCalled)
+            releaseBitmapContextData(this, this->data());
+        return nullptr;
+    }
+    ASSERT(!m_releaseBitmapContextDataCalled);
 
     // We want the origin to be in the top left corner so we flip the backing store context.
@@ -172 +181 @@
     ShareableBitmap* bitmap = static_cast<ShareableBitmap*>(typelessBitmap);
     ASSERT_UNUSED(typelessData, bitmap->data() == typelessData);
+    bitmap->m_releaseBitmapContextDataCalled = true;
     bitmap->deref(); // Balanced by ref in createGraphicsContext.
 }