Title: [228610] releases/WebKitGTK/webkit-2.20/Source/WebCore
- Revision
- 228610
- Author
- [email protected]
- Date
- 2018-02-19 00:23:01 -0800 (Mon, 19 Feb 2018)
Log Message
Merge r228091 - Unreviewed, rolling out r228085.
Pixel data stride is imposed by OpenGL and shouldn't be
adjusted for Cairo
Reverted changeset:
"[Cairo] Correctly calculate stride in
GraphicsContext3D::paintToCanvas()"
https://bugs.webkit.org/show_bug.cgi?id=182466
https://trac.webkit.org/changeset/228085
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (228609 => 228610)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-19 08:07:57 UTC (rev 228609)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-19 08:23:01 UTC (rev 228610)
@@ -1,3 +1,17 @@
+2018-02-05 Zan Dobersek <[email protected]>
+
+ Unreviewed, rolling out r228085.
+
+ Pixel data stride is imposed by OpenGL and shouldn't be
+ adjusted for Cairo
+
+ Reverted changeset:
+
+ "[Cairo] Correctly calculate stride in
+ GraphicsContext3D::paintToCanvas()"
+ https://bugs.webkit.org/show_bug.cgi?id=182466
+ https://trac.webkit.org/changeset/228085
+
2018-02-05 Carlos Garcia Campos <[email protected]>
[SOUP] WebSockets must use system proxy settings
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp (228609 => 228610)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2018-02-19 08:07:57 UTC (rev 228609)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2018-02-19 08:23:01 UTC (rev 228610)
@@ -121,8 +121,7 @@
cairo_paint(cr);
RefPtr<cairo_surface_t> imageSurface = adoptRef(cairo_image_surface_create_for_data(
- const_cast<unsigned char*>(imagePixels), CAIRO_FORMAT_ARGB32, imageSize.width(), imageSize.height(),
- cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, imageSize.width())));
+ const_cast<unsigned char*>(imagePixels), CAIRO_FORMAT_ARGB32, imageSize.width(), imageSize.height(), imageSize.width() * 4));
// OpenGL keeps the pixels stored bottom up, so we need to flip the image here.
cairo_translate(cr, 0, imageSize.height());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
