Changeset 231638 in webkit

Timestamp:

May 10, 2018 7:50:41 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Implement ImageBuffer::toBGRAData
​https://bugs.webkit.org/show_bug.cgi?id=185511

Patch by Thibault Saunier <​tsaunier@igalia.com> on 2018-05-10
Reviewed by Michael Catanzaro.

This was never implemented but will be required for the MediaStream API
tests.

• platform/graphics/ImageBuffer.cpp:

(WebCore::ImageBuffer::toBGRAData const):

• platform/graphics/cg/ImageBufferCG.cpp:

(WebCore::ImageBuffer::toBGRAData const):

• platform/graphics/gtk/ImageBufferGtk.cpp:

(WebCore::ImageBuffer::toBGRAData const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ImageBuffer.cpp (modified) (1 diff)
• platform/graphics/cg/ImageBufferCG.cpp (modified) (1 diff)
• platform/graphics/gtk/ImageBufferGtk.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-10  Thibault Saunier  <tsaunier@igalia.com>
+
+        [GTK] Implement ImageBuffer::toBGRAData
+        https://bugs.webkit.org/show_bug.cgi?id=185511
+
+        Reviewed by Michael Catanzaro.
+
+        This was never implemented but will be required for the MediaStream API
+        tests.
+
+        * platform/graphics/ImageBuffer.cpp:
+        (WebCore::ImageBuffer::toBGRAData const):
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::ImageBuffer::toBGRAData const):
+        * platform/graphics/gtk/ImageBufferGtk.cpp:
+        (WebCore::ImageBuffer::toBGRAData const):
+
 2018-05-10  Yacine Bandou  <yacine.bandou_ext@softathome.com>
 

trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp

@@ -103 +103 @@
 }
 
+#if !USE(CG) && !PLATFORM(GTK)
 Vector<uint8_t> ImageBuffer::toBGRAData() const
 {
-#if USE(CG)
-    if (context().isAcceleratedContext())
-        flushContext();
-    return m_data.toBGRAData(context().isAcceleratedContext(), m_size.width(), m_size.height());
-#else
     // FIXME: Implement this for other backends.
     return { };
-#endif
-}
+}
+#endif
 
 #if !(USE(CG) || USE(DIRECT2D))

trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -631 +631 @@
 }
 
+Vector<uint8_t> ImageBuffer::toBGRAData() const
+{
+    if (context().isAcceleratedContext())
+        flushContext();
+    return m_data.toBGRAData(context().isAcceleratedContext(), m_size.width(), m_size.height());
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp

@@ -21 +21 @@
 
 #include "CairoUtilities.h"
+#include "GRefPtrGtk.h"
 #include "GdkCairoUtilities.h"
-#include "GRefPtrGtk.h"
 #include "MIMETypeRegistry.h"
 #include <cairo.h>
@@ -88 +88 @@
 }
 
+Vector<uint8_t> ImageBuffer::toBGRAData() const
+{
+    auto pixbuf = adoptGRef(cairoSurfaceToGdkPixbuf(m_data.m_surface.get()));
+    auto pixels = gdk_pixbuf_get_pixels(pixbuf.get());
+
+    Vector<uint8_t> imageData;
+    imageData.append(pixels, gdk_pixbuf_get_byte_length(pixbuf.get()));
+    return imageData;
+}
+
 Vector<uint8_t> ImageBuffer::toData(const String& mimeType, std::optional<double> quality) const
 {