Title: [206225] releases/WebKitGTK/webkit-2.14/Source/WebKit2
Revision
206225
Author
g...@gnome.org
Date
2016-09-21 11:42:21 -0700 (Wed, 21 Sep 2016)

Log Message

Merge 206216 - Unreviewed, build fix.

* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::AcceleratedBackingStoreWayland::paint): fix usage of deviceScaleFactor variable which was
removed.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (206224 => 206225)


--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog	2016-09-21 18:41:07 UTC (rev 206224)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog	2016-09-21 18:42:21 UTC (rev 206225)
@@ -1,3 +1,11 @@
+2016-09-21  Gustavo Noronha Silva  <gustavo.noro...@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  <cgar...@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.14.0 release.

Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (206224 => 206225)


--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-21 18:41:07 UTC (rev 206224)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp	2016-09-21 18:42:21 UTC (rev 206225)
@@ -117,7 +117,7 @@
 
     // 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);
 
     cairo_rectangle(cr, clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to