Changeset 206070 in webkit

Timestamp:

Sep 17, 2016 3:50:07 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r206045 - [GTK] Surface created for glReadPixels path on Wayland is bigger than needed
​https://bugs.webkit.org/show_bug.cgi?id=162025

Reviewed by Carlos Garcia Campos.

• UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:

(WebKit::AcceleratedBackingStoreWayland::paint): the texture created by the Wayland
compositor is already scaled, so scaling its size when creating the surface causes it
to end up bigger than necessary.

Location:

releases/WebKitGTK/webkit-2.14/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-15  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        [GTK] Surface created for glReadPixels path on Wayland is bigger than needed
+        https://bugs.webkit.org/show_bug.cgi?id=162025
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+        (WebKit::AcceleratedBackingStoreWayland::paint): the texture created by the Wayland
+        compositor is already scaled, so scaling its size when creating the surface causes it
+        to end up bigger than necessary.
+
 2016-09-15  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp

@@ -76 +76 @@
     gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(m_webPage.viewWidget()), texture, GL_TEXTURE, 1, clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height());
 #else
-    IntSize size = textureSize;
-    float deviceScaleFactor = m_webPage.deviceScaleFactor();
-    size.scale(deviceScaleFactor);
+    if (!m_surface || cairo_image_surface_get_width(m_surface.get()) != textureSize.width() || cairo_image_surface_get_height(m_surface.get()) != textureSize.height())
+        m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, textureSize.width(), textureSize.height()));
 
-    if (!m_surface || cairo_image_surface_get_width(m_surface.get()) != size.width() || cairo_image_surface_get_height(m_surface.get()) != size.height())
-        m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, size.width(), size.height()));
-    cairoSurfaceSetDeviceScale(m_surface.get(), deviceScaleFactor, deviceScaleFactor);
+    cairoSurfaceSetDeviceScale(m_surface.get(), m_webPage.deviceScaleFactor(), m_webPage.deviceScaleFactor());
 
     GLuint fb;
@@ -104 +101 @@
 
     // Convert to BGRA.
-    int totalBytes = size.width() * size.height() * 4;
+    int totalBytes = textureSize.width() * textureSize.height() * 4;
     for (int i = 0; i < totalBytes; i += 4)
         std::swap(data[i], data[i + 2]);