Changeset 251654 in webkit

Timestamp:

Oct 28, 2019 8:06:07 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r251651.
​https://bugs.webkit.org/show_bug.cgi?id=203488

It's causing crashes in several tests (Requested by KaL on
#webkit).

Reverted changeset:

"ImageDecoders: use a thread safe data buffer for Cairo
backing store"
​https://bugs.webkit.org/show_bug.cgi?id=201727
​https://trac.webkit.org/changeset/251651

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-28  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r251651.
+        https://bugs.webkit.org/show_bug.cgi?id=203488
+
+        It's causing crashes in several tests (Requested by KaL on
+        #webkit).
+
+        Reverted changeset:
+
+        "ImageDecoders: use a thread safe data buffer for Cairo
+        backing store"
+        https://bugs.webkit.org/show_bug.cgi?id=201727
+        https://trac.webkit.org/changeset/251651
+
 2019-10-28  Charlie Turner  <cturner@igalia.com>
 

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

@@ -60 +60 @@
             return false;
 
-        m_pixels = RGBAPixelBufferThreadSafeRefCounted::create(size);
-
-        if (!m_pixels->isValid())
+        Vector<char> buffer;
+        size_t bufferSize = size.area().unsafeGet() * sizeof(RGBA32);
+
+        if (!buffer.tryReserveCapacity(bufferSize))
             return false;
 
+        buffer.grow(bufferSize);
+        m_pixels = SharedBuffer::create(WTFMove(buffer));
+        m_pixelsPtr = reinterpret_cast<RGBA32*>(const_cast<char*>(m_pixels->data()));
         m_size = size;
         m_frameRect = IntRect(IntPoint(), m_size);
@@ -83 +87 @@
     void clear()
     {
-        m_pixels->zeroPixelData();
+        memset(m_pixelsPtr, 0, (m_size.area() * sizeof(RGBA32)).unsafeGet());
     }
 
@@ -130 +134 @@
     {
         ASSERT(inBounds(IntPoint(x, y)));
-        return m_pixels->pixelAt(x, y);
+        return m_pixelsPtr + y * m_size.width() + x;
     }
 
@@ -186 +190 @@
 
 private:
-    class RGBAPixelBufferThreadSafeRefCounted : public ThreadSafeRefCounted<RGBAPixelBufferThreadSafeRefCounted> {
-    public:
-        static Ref<RGBAPixelBufferThreadSafeRefCounted> create(const IntSize& initialSize) { return adoptRef(*new RGBAPixelBufferThreadSafeRefCounted(initialSize)); }
-        void zeroPixelData() { m_pixels.fill(0); }
-        RGBA32* pixelAt(int x, int y) const { return const_cast<unsigned*>(&m_pixels.data()[y * m_size.width() + x]); }
-        const RGBA32* data() const { return m_pixels.data(); }
-        bool isValid() const { return m_isValid; }
-    private:
-        RGBAPixelBufferThreadSafeRefCounted(const IntSize& initialSize)
-            : m_size(initialSize)
-        {
-            unsigned bufferSize = initialSize.area().unsafeGet();
-            m_isValid = m_pixels.tryReserveCapacity(bufferSize);
-            if (m_isValid)
-                m_pixels.resize(bufferSize);
-        }
-        IntSize m_size;
-        Vector<RGBA32> m_pixels;
-        bool m_isValid { false };
-    };
-
     ImageBackingStore(const IntSize& size, bool premultiplyAlpha = true)
         : m_premultiplyAlpha(premultiplyAlpha)
@@ -219 +202 @@
     {
         ASSERT(!m_size.isEmpty() && !isOverSize(m_size));
+        m_pixels = SharedBuffer::create(other.m_pixels->data(), other.m_pixels->size());
+        m_pixelsPtr = reinterpret_cast<RGBA32*>(const_cast<char*>(m_pixels->data()));
     }
 
@@ -242 +227 @@
     }
 
-    RefPtr<RGBAPixelBufferThreadSafeRefCounted> m_pixels;
-
+    RefPtr<SharedBuffer> m_pixels;
+    RGBA32* m_pixelsPtr { nullptr };
     IntSize m_size;
     IntRect m_frameRect; // This will always just be the entire buffer except for GIF and PNG frames

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

@@ -35 +35 @@
     m_pixels->ref();
     RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create_for_data(
-        reinterpret_cast<unsigned char*>(const_cast<uint32_t*>(m_pixels->data())),
+        reinterpret_cast<unsigned char*>(const_cast<uint32_t*>(m_pixelsPtr)),
         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<RGBAPixelBufferThreadSafeRefCounted*>(data)->deref(); });
+    cairo_surface_set_user_data(surface.get(), &s_surfaceDataKey, m_pixels.get(), [](void* data) { static_cast<SharedBuffer*>(data)->deref(); });
 
     return surface;