| Index: components/exo/wayland/server.cc
|
| diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
|
| index 727f7bcfb9690d51a2318742b6b58198efc5eb4e..cb6b9cc6d6caeb104b0669e643f3b2b13419cf27 100644
|
| --- a/components/exo/wayland/server.cc
|
| +++ b/components/exo/wayland/server.cc
|
| @@ -156,11 +156,9 @@ DEFINE_SURFACE_PROPERTY_KEY(bool, kSurfaceHasSecurityKey, false);
|
| // associated with window.
|
| DEFINE_SURFACE_PROPERTY_KEY(bool, kSurfaceHasBlendingKey, false);
|
|
|
| -#if defined(USE_OZONE)
|
| // A property key containing a boolean set to true if a blending object is
|
| // associated with window.
|
| DEFINE_SURFACE_PROPERTY_KEY(bool, kSurfaceHasSynchronizationKey, false);
|
| -#endif
|
|
|
| wl_resource* GetSurfaceResource(Surface* surface) {
|
| return surface->GetProperty(kSurfaceResourceKey);
|
| @@ -769,6 +767,7 @@ void bind_linux_dmabuf(wl_client* client,
|
| for (const auto& supported_format : dmabuf_supported_formats)
|
| zwp_linux_dmabuf_v1_send_format(resource, supported_format.dmabuf_format);
|
| }
|
| +#endif // defined(USE_OZONE)
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // synchronization interface:
|
| @@ -874,7 +873,6 @@ void bind_linux_explicit_synchronization(wl_client* client,
|
| wl_resource_set_implementation(
|
| resource, &linux_explicit_synchronization_implementation, data, nullptr);
|
| }
|
| -#endif
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // wl_subsurface_interface:
|
| @@ -3093,10 +3091,10 @@ Server::Server(Display* display)
|
| bind_drm);
|
| wl_global_create(wl_display_.get(), &zwp_linux_dmabuf_v1_interface, 1,
|
| display_, bind_linux_dmabuf);
|
| +#endif // defined(USE_OZONE)
|
| wl_global_create(wl_display_.get(),
|
| &zcr_linux_explicit_synchronization_v1_interface, 1,
|
| display_, bind_linux_explicit_synchronization);
|
| -#endif
|
| wl_global_create(wl_display_.get(), &wl_subcompositor_interface, 1, display_,
|
| bind_subcompositor);
|
| wl_global_create(wl_display_.get(), &wl_shell_interface, 1, display_,
|
|
|