Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Unified Diff: ui/ozone/platform/wayland/wayland_object.cc

Issue 2027943002: [WIP] Make content_shell run under Wayland Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/wayland/wayland_object.cc
diff --git a/ui/ozone/platform/wayland/wayland_object.cc b/ui/ozone/platform/wayland/wayland_object.cc
index 6b7f1e185aef572b7fd4fe9b247a8f1e545daa05..6fecbf4da33e4959e34910eab2bbf422334e5985 100644
--- a/ui/ozone/platform/wayland/wayland_object.cc
+++ b/ui/ozone/platform/wayland/wayland_object.cc
@@ -10,6 +10,10 @@
namespace wl {
namespace {
+void delete_output(wl_output* output) {
+ wl_output_destroy(output);
+}
+
void delete_pointer(wl_pointer* pointer) {
if (wl_pointer_get_version(pointer) >= WL_POINTER_RELEASE_SINCE_VERSION)
wl_pointer_release(pointer);
@@ -37,6 +41,9 @@ void (*ObjectTraits<wl_compositor>::deleter)(wl_compositor*) =
const wl_interface* ObjectTraits<wl_display>::interface = &wl_display_interface;
void (*ObjectTraits<wl_display>::deleter)(wl_display*) = &wl_display_disconnect;
+const wl_interface* ObjectTraits<wl_output>::interface = &wl_output_interface;
+void (*ObjectTraits<wl_output>::deleter)(wl_output*) = &delete_output;
Michael Forney 2016/06/01 20:48:01 Just use &wl_output_destroy here.
joone 2016/06/03 22:43:10 Done.
+
const wl_interface* ObjectTraits<wl_pointer>::interface = &wl_pointer_interface;
void (*ObjectTraits<wl_pointer>::deleter)(wl_pointer*) = &delete_pointer;

Powered by Google App Engine
This is Rietveld 408576698