Revert "Cherry-pick e633a9d. rdar://113298905"

This reverts commit aa90250. Identifier: 267312.2@safari-7617.1.6-branch
WebKit · Aug 29, 2023 · 49d771c · 49d771c
1 parent 3047163
commit 49d771c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 57 deletions.
diff --git a/LayoutTests/http/tests/images/repaint-garbled-expected.html b/LayoutTests/http/tests/images/repaint-garbled-expected.html
diff --git a/LayoutTests/http/tests/images/repaint-garbled.html b/LayoutTests/http/tests/images/repaint-garbled.html
diff --git a/LayoutTests/http/tests/images/resources/green-313x313.jxl b/LayoutTests/http/tests/images/resources/green-313x313.jxl
diff --git a/Source/WebCore/platform/graphics/cg/ImageBackingStoreCG.cpp b/Source/WebCore/platform/graphics/cg/ImageBackingStoreCG.cpp
@@ -28,12 +28,6 @@
 
 namespace WebCore {
 
-static void dataProviderReleaseCallback(void* info, const void*, size_t)
-{
-    auto* pixels = static_cast<FragmentedSharedBuffer::DataSegment*>(info);
-    pixels->deref(); // Balanced below in ImageBackingStore::image().
-}
-
 PlatformImagePtr ImageBackingStore::image() const
 {
     static const size_t bytesPerPixel = 4;
@@ -43,12 +37,7 @@ PlatformImagePtr ImageBackingStore::image() const
     size_t bytesPerRow = bytesPerPixel * width;
 
     auto colorSpace = adoptCF(CGColorSpaceCreateWithName(kCGColorSpaceSRGB));
-    auto dataProvider = adoptCF(CGDataProviderCreateWithData(m_pixels.get(), m_pixelsPtr, height * bytesPerRow, dataProviderReleaseCallback));
-
-    if (!dataProvider)
-        return nullptr;
-
-    m_pixels->ref(); // Balanced above in dataProviderReleaseCallback().
+    auto dataProvider = adoptCF(CGDataProviderCreateWithData(nullptr, m_pixelsPtr, height * bytesPerRow, nullptr));
     return adoptCF(CGImageCreate(width, height, bitsPerComponent, bytesPerPixel * 8, bytesPerRow, colorSpace.get(), (m_premultiplyAlpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaFirst) | kCGImageByteOrder32Little, dataProvider.get(), nullptr, true, kCGRenderingIntentDefault));
 }