Changeset 206225 in webkit

Timestamp:

Sep 21, 2016 11:42:21 AM (8 years ago)

Author:

Gustavo Noronha Silva

Message:

Merge 206216 - Unreviewed, build fix.

• UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:

(WebKit::AcceleratedBackingStoreWayland::paint): fix usage of deviceScaleFactor variable which was
removed.

Location:

releases/WebKitGTK/webkit-2.14/Source/WebKit2

Files:

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

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

@@ +1 @@
+2016-09-21  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Unreviewed, build fix.
+
+        * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+        (WebKit::AcceleratedBackingStoreWayland::paint): fix usage of deviceScaleFactor variable which was
+        removed.
+
 2016-09-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -118 +118 @@
     // The compositor renders the texture flipped for gdk_cairo_draw_from_gl, fix that here.
     cairo_matrix_t transform;
-    cairo_matrix_init(&transform, 1, 0, 0, -1, 0, textureSize.height() / deviceScaleFactor);
+    cairo_matrix_init(&transform, 1, 0, 0, -1, 0, textureSize.height() / m_webPage.deviceScaleFactor());
     cairo_transform(cr, &transform);