Changeset 228085 in webkit

Timestamp:

Feb 4, 2018 11:38:08 PM (6 years ago)

Author:

zandobersek@gmail.com

Message:

[Cairo] Correctly calculate stride in GraphicsContext3D::paintToCanvas()
​https://bugs.webkit.org/show_bug.cgi?id=182466

Reviewed by Michael Catanzaro.

• platform/graphics/cairo/GraphicsContext3DCairo.cpp:

(WebCore::GraphicsContext3D::paintToCanvas):
Use cairo_format_stride_for_width() to obtain stride that Cairo thinks
is appropriate for the given width, taking into account internal
alignment requirements.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/GraphicsContext3DCairo.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-04  Zan Dobersek  <zdobersek@igalia.com>
+
+        [Cairo] Correctly calculate stride in GraphicsContext3D::paintToCanvas()
+        https://bugs.webkit.org/show_bug.cgi?id=182466
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+        (WebCore::GraphicsContext3D::paintToCanvas):
+        Use cairo_format_stride_for_width() to obtain stride that Cairo thinks
+        is appropriate for the given width, taking into account internal
+        alignment requirements.
+
 2018-02-04  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp

@@ -122 +122 @@
 
     RefPtr<cairo_surface_t> imageSurface = adoptRef(cairo_image_surface_create_for_data(
-        const_cast<unsigned char*>(imagePixels), CAIRO_FORMAT_ARGB32, imageSize.width(), imageSize.height(), imageSize.width() * 4));
+        const_cast<unsigned char*>(imagePixels), CAIRO_FORMAT_ARGB32, imageSize.width(), imageSize.height(),
+        cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, imageSize.width())));
 
     // OpenGL keeps the pixels stored bottom up, so we need to flip the image here.