Changeset 251771 in webkit

Timestamp:

Oct 30, 2019 12:59:03 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

ImageDecoders: use a thread safe data buffer for Cairo backing store
​https://bugs.webkit.org/show_bug.cgi?id=201727
<rdar://problem/56665041>

Reviewed by Fujii Hironori.

Use SharedBuffer::dataSegment which is ThreadSafeRefCounted.

• platform/graphics/ImageBackingStore.h:

(WebCore::ImageBackingStore::setSize):
(WebCore::ImageBackingStore::ImageBackingStore):

• platform/image-decoders/cairo/ImageBackingStoreCairo.cpp:

(WebCore::ImageBackingStore::image const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ImageBackingStore.h (modified) (3 diffs)
• platform/image-decoders/cairo/ImageBackingStoreCairo.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-30  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        ImageDecoders: use a thread safe data buffer for Cairo backing store
+        https://bugs.webkit.org/show_bug.cgi?id=201727
+        <rdar://problem/56665041>
+
+        Reviewed by Fujii Hironori.
+
+        Use SharedBuffer::dataSegment which is ThreadSafeRefCounted.
+
+        * platform/graphics/ImageBackingStore.h:
+        (WebCore::ImageBackingStore::setSize):
+        (WebCore::ImageBackingStore::ImageBackingStore):
+        * platform/image-decoders/cairo/ImageBackingStoreCairo.cpp:
+        (WebCore::ImageBackingStore::image const):
+
 2019-10-29  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/platform/graphics/ImageBackingStore.h

@@ -67 +67 @@
 
         buffer.grow(bufferSize);
-        m_pixels = SharedBuffer::create(WTFMove(buffer));
+        m_pixels = SharedBuffer::DataSegment::create(WTFMove(buffer));
         m_pixelsPtr = reinterpret_cast<RGBA32*>(const_cast<char*>(m_pixels->data()));
         m_size = size;
@@ -202 +202 @@
     {
         ASSERT(!m_size.isEmpty() && !isOverSize(m_size));
-        m_pixels = SharedBuffer::create(other.m_pixels->data(), other.m_pixels->size());
+        Vector<char> buffer;
+        buffer.append(other.m_pixels->data(), other.m_pixels->size());
+        m_pixels = SharedBuffer::DataSegment::create(WTFMove(buffer));
         m_pixelsPtr = reinterpret_cast<RGBA32*>(const_cast<char*>(m_pixels->data()));
     }
@@ -227 +229 @@
     }
 
-    RefPtr<SharedBuffer> m_pixels;
+    RefPtr<SharedBuffer::DataSegment> m_pixels;
     RGBA32* m_pixelsPtr { nullptr };
     IntSize m_size;

trunk/Source/WebCore/platform/image-decoders/cairo/ImageBackingStoreCairo.cpp

@@ -38 +38 @@
         CAIRO_FORMAT_ARGB32, size().width(), size().height(), size().width() * sizeof(uint32_t)));
     static cairo_user_data_key_t s_surfaceDataKey;
-    cairo_surface_set_user_data(surface.get(), &s_surfaceDataKey, m_pixels.get(), [](void* data) { static_cast<SharedBuffer*>(data)->deref(); });
+    cairo_surface_set_user_data(surface.get(), &s_surfaceDataKey, m_pixels.get(), [](void* data) { static_cast<SharedBuffer::DataSegment*>(data)->deref(); });
 
     return surface;