Commit a4ed1412 authored by Yuichiro Hanada's avatar Yuichiro Hanada Committed by Commit Bot

Increase zcr_remote_shell_v1 version and zcr_notification_surface_v1 version to 16.

The version of the global interface should be increased when the
protocol is modified, as it is how we detect a version incompatibility
immediately on bootup.
For consistency, the version of zcr_notification_surface_v1 is also
increated in this CL.

Bug: 829383, 834027
Change-Id: I33e8fbdbe0798e70743ad2af83e4ada80e7797dc
Reviewed-on: https://chromium-review.googlesource.com/1055030Reviewed-by: default avatarDavid Reveman <reveman@chromium.org>
Commit-Queue: Yuichiro Hanada <yhanada@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558862}
parent 98b22b72
...@@ -1788,7 +1788,7 @@ zcr_remote_surface_v1_pip(struct zcr_remote_surface_v1 *zcr_remote_surface_v1) ...@@ -1788,7 +1788,7 @@ zcr_remote_surface_v1_pip(struct zcr_remote_surface_v1 *zcr_remote_surface_v1)
/** /**
* @ingroup iface_zcr_notification_surface_v1 * @ingroup iface_zcr_notification_surface_v1
*/ */
#define ZCR_NOTIFICATION_SURFACE_V1_SET_APP_ID_SINCE_VERSION 2 #define ZCR_NOTIFICATION_SURFACE_V1_SET_APP_ID_SINCE_VERSION 16
/** @ingroup iface_zcr_notification_surface_v1 */ /** @ingroup iface_zcr_notification_surface_v1 */
static inline void static inline void
......
...@@ -1498,7 +1498,7 @@ struct zcr_notification_surface_v1_interface { ...@@ -1498,7 +1498,7 @@ struct zcr_notification_surface_v1_interface {
* set application ID * set application ID
* *
* Set an application identifier for the notification surface. * Set an application identifier for the notification surface.
* @since 2 * @since 16
*/ */
void (*set_app_id)(struct wl_client *client, void (*set_app_id)(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource,
...@@ -1513,7 +1513,7 @@ struct zcr_notification_surface_v1_interface { ...@@ -1513,7 +1513,7 @@ struct zcr_notification_surface_v1_interface {
/** /**
* @ingroup iface_zcr_notification_surface_v1 * @ingroup iface_zcr_notification_surface_v1
*/ */
#define ZCR_NOTIFICATION_SURFACE_V1_SET_APP_ID_SINCE_VERSION 2 #define ZCR_NOTIFICATION_SURFACE_V1_SET_APP_ID_SINCE_VERSION 16
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -70,7 +70,7 @@ static const struct wl_message zcr_remote_shell_v1_events[] = { ...@@ -70,7 +70,7 @@ static const struct wl_message zcr_remote_shell_v1_events[] = {
}; };
WL_EXPORT const struct wl_interface zcr_remote_shell_v1_interface = { WL_EXPORT const struct wl_interface zcr_remote_shell_v1_interface = {
"zcr_remote_shell_v1", 15, "zcr_remote_shell_v1", 16,
3, zcr_remote_shell_v1_requests, 3, zcr_remote_shell_v1_requests,
5, zcr_remote_shell_v1_events, 5, zcr_remote_shell_v1_events,
}; };
...@@ -137,11 +137,11 @@ WL_EXPORT const struct wl_interface zcr_remote_surface_v1_interface = { ...@@ -137,11 +137,11 @@ WL_EXPORT const struct wl_interface zcr_remote_surface_v1_interface = {
static const struct wl_message zcr_notification_surface_v1_requests[] = { static const struct wl_message zcr_notification_surface_v1_requests[] = {
{ "destroy", "", types + 0 }, { "destroy", "", types + 0 },
{ "set_app_id", "2s", types + 0 }, { "set_app_id", "16s", types + 0 },
}; };
WL_EXPORT const struct wl_interface zcr_notification_surface_v1_interface = { WL_EXPORT const struct wl_interface zcr_notification_surface_v1_interface = {
"zcr_notification_surface_v1", 2, "zcr_notification_surface_v1", 16,
2, zcr_notification_surface_v1_requests, 2, zcr_notification_surface_v1_requests,
0, NULL, 0, NULL,
}; };
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
reset. reset.
</description> </description>
<interface name="zcr_remote_shell_v1" version="15"> <interface name="zcr_remote_shell_v1" version="16">
<description summary="remote_shell"> <description summary="remote_shell">
The global interface that allows clients to turn a wl_surface into a The global interface that allows clients to turn a wl_surface into a
"real window" which is remotely managed but can be stacked, activated "real window" which is remotely managed but can be stacked, activated
...@@ -894,7 +894,7 @@ ...@@ -894,7 +894,7 @@
</interface> </interface>
<interface name="zcr_notification_surface_v1" version="2"> <interface name="zcr_notification_surface_v1" version="16">
<description summary="A notification window"> <description summary="A notification window">
An interface that may be implemented by a wl_surface to host An interface that may be implemented by a wl_surface to host
notification contents. notification contents.
...@@ -906,9 +906,9 @@ ...@@ -906,9 +906,9 @@
</description> </description>
</request> </request>
<!-- Version 2 additions --> <!-- Version 16 additions -->
<request name="set_app_id" since="2"> <request name="set_app_id" since="16">
<description summary="set application ID"> <description summary="set application ID">
Set an application identifier for the notification surface. Set an application identifier for the notification surface.
</description> </description>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment