Title: [205642] releases/WebKitGTK/webkit-2.14/Source/WebKit2
- Revision
- 205642
- Author
- [email protected]
- Date
- 2016-09-08 08:26:53 -0700 (Thu, 08 Sep 2016)
Log Message
Merge r205397 - [GTK] -Wmissing-field-initializers on WaylandCompositor.cpp:295
https://bugs.webkit.org/show_bug.cgi?id=161524
Reviewed by Carlos Garcia Campos.
* UIProcess/gtk/WaylandCompositor.cpp:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (205641 => 205642)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-09-08 15:21:57 UTC (rev 205641)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-09-08 15:26:53 UTC (rev 205642)
@@ -1,3 +1,12 @@
+2016-09-02 Michael Catanzaro <[email protected]>
+
+ [GTK] -Wmissing-field-initializers on WaylandCompositor.cpp:295
+ https://bugs.webkit.org/show_bug.cgi?id=161524
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/gtk/WaylandCompositor.cpp:
+
2016-09-02 Carlos Garcia Campos <[email protected]>
[Threaded Compositor] Move the viewport controller off the compositing thread
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp (205641 => 205642)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-09-08 15:21:57 UTC (rev 205641)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-09-08 15:26:53 UTC (rev 205642)
@@ -291,7 +291,11 @@
// setBufferTransformCallback
[](struct wl_client*, struct wl_resource*, int32_t) { },
// setBufferScaleCallback
- [](struct wl_client*, struct wl_resource*, int32_t) { }
+ [](struct wl_client*, struct wl_resource*, int32_t) { },
+#if WAYLAND_VERSION_MAJOR > 1 || (WAYLAND_VERSION_MAJOR == 1 && WAYLAND_VERSION_MINOR >= 10)
+ // damageBufferCallback
+ [](struct wl_client*, struct wl_resource*, int32_t, int32_t, int32_t, int32_t) { },
+#endif
};
static const struct wl_compositor_interface compositorInterface = {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
