Revert "Update zcr_remote_shell_v1 protocol to version 29"
Revert "WLS: Listen to events from zcr_remote_output_v1"
Revert submission 12203692-wls-listen-to-remote-output
Reason for revert: A revert of a cherry-pick of this change to AOSP is causing many downstream branches to break. Reverting to fix builds.
Reverted Changes:
Ib631088e5:Update zcr_remote_shell_v1 protocol to version 29
Ib476a853a:WLS: Listen to events from zcr_remote_output_v1
Change-Id: I7f3e139587e1e127caaad8fecb9f2c11dacfe271
diff --git a/chromium.org/unstable/remote-shell/remote-shell-unstable-v1.xml b/chromium.org/unstable/remote-shell/remote-shell-unstable-v1.xml
index 7190f47..08f26f4 100644
--- a/chromium.org/unstable/remote-shell/remote-shell-unstable-v1.xml
+++ b/chromium.org/unstable/remote-shell/remote-shell-unstable-v1.xml
@@ -38,7 +38,7 @@
reset.
</description>
- <interface name="zcr_remote_shell_v1" version="29">
+ <interface name="zcr_remote_shell_v1" version="26">
<description summary="remote_shell">
The global interface that allows clients to turn a wl_surface into a
"real window" which is remotely managed but can be stacked, activated
@@ -235,48 +235,9 @@
<arg name="identification_data" type="array" summary="EDID blob data"/>
</event>
- <!-- Version 28 additions -->
-
- <request name="get_toast_surface" since="28">
- <description summary="Create a toast surface from a surface">
- Creates an toast_surface for the given surface, gives it
- the toast_surface role.
- </description>
- <arg name="id" type="new_id" interface="zcr_toast_surface_v1"/>
- <arg name="surface" type="object" interface="wl_surface"/>
- </request>
-
- <!-- Version 29 additions -->
-
- <event name="layout_mode" since="29">
- <description summary="sends the layout_mode">
- Sends the layout_mode used by the server.
- </description>
- <arg name="layout_mode" type="int" summary="layout_mode enum"/>
- </event>
-
- <request name="get_remote_output" since="29">
- <description summary="extend output interface for remote shell">
- Instantiate an interface extension for the given wl_output to
- provide remote shell functionality.
- </description>
- <arg name="id" type="new_id" interface="zcr_remote_output_v1" summary="the new remote output interface id"/>
- <arg name="output" type="object" interface="wl_output" summary="the output"/>
- </request>
-
- <request name="set_use_default_device_scale_cancellation" since="29">
- <description summary="set use default device scale cancellation">
- Request the compositor to use the default_device_scale_factor to undo any
- scaling applied to the client's buffers. When this is disabled, the
- compositor will use the device_scale_factor of the display of the buffer to
- cancel any buffer scaling.
- </description>
- <arg name="use_default_device_scale_factor" type="int" summary="0 if false"/>
- </request>
-
</interface>
- <interface name="zcr_remote_surface_v1" version="27">
+ <interface name="zcr_remote_surface_v1" version="26">
<description summary="A desktop window">
An interface that may be implemented by a wl_surface, for
implementations that provide a desktop-style user interface
@@ -1094,14 +1055,6 @@
Unset this surface the original window for the current PIP window.
</description>
</request>
-
- <request name="set_system_gesture_exclusion" since="27">
- <description summary="set system gesture exclusion">
- Set system gesture exclusion region in which system gestures e.g. back
- gesture should not be triggered.
- </description>
- <arg name="region" type="object" interface="wl_region" allow-null="true"/>
- </request>
</interface>
<interface name="zcr_notification_surface_v1" version="16">
@@ -1167,124 +1120,4 @@
</request>
</interface>
- <interface name="zcr_toast_surface_v1" version="28">
- <description summary="A toast window">
- An interface that may be implemented by a wl_surface to host
- toast contents.
- </description>
-
- <request name="destroy" type="destructor">
- <description summary="Destroy the toast_surface">
- Unmap and destroy the toast surface.
- </description>
- </request>
-
- <request name="set_position">
- <description summary="set toast bounds position">
- Set the position of bounds of a window from the user's perspective.
-
- The bounds are double buffered, and will be applied at the
- time wl_surface.commit of the corresponding wl_surface is called.
-
- Once the bounds are set, it is not possible to unset them, and they will
- remain the same until set_position is called again, even if a new sub-
- surface or buffer is attached.
-
- If never set, the compositor will determine the toast position.
-
- The bounds are relative to the given display. If the display is invalid,
- they are assumed to be relative to the primary display.
- </description>
- <arg name="display_id_hi" type="uint"/>
- <arg name="display_id_lo" type="uint"/>
- <arg name="x" type="int"/>
- <arg name="y" type="int"/>
- </request>
-
- <request name="set_size">
- <description summary="set toast bounds size">
- Set the size of bounds of a window from the user's perspective.
-
- The bounds are double buffered, and will be applied at the
- time wl_surface.commit of the corresponding wl_surface is called.
-
- Once the bounds are set, it is not possible to unset them, and they will
- remain the same until set_size is called again, even if a new sub-
- surface or buffer is attached.
-
- If never set, the value is the surface content bounds. This updates
- dynamically on every commit.
-
- The width and height must be greater than zero.
- </description>
- <arg name="width" type="int"/>
- <arg name="height" type="int"/>
- </request>
- </interface>
-
- <interface name="zcr_remote_output_v1" version="29">
- <description summary="remote shell interface to a wl_output">
- An additional interface to a wl_output object, which allows the
- client to access additional functionality for output.
- </description>
-
- <request name="destroy" type="destructor" since="29">
- <description summary="destroy remote_output">
- Destroy this remote_output object.
- </description>
- </request>
-
- <event name="display_id" since="29">
- <description summary="the identifier for the display">
- Sends the display identifier used by the server for the display.
- </description>
- <arg name="display_id_hi" type="uint"/>
- <arg name="display_id_lo" type="uint"/>
- </event>
-
- <event name="port" since="29">
- <description summary="the port of the display">
- Sends the port to which the display is connected for the server.
- </description>
- <arg name="port" type="uint"/>
- </event>
-
- <event name="identification_data" since="29">
- <description summary="the identification data for the display">
- Sends the identification data for the display, typically in the EDID format.
- </description>
- <arg name="identification_data" type="array"/>
- </event>
-
- <event name="insets" since="29">
- <description summary="insets for the display in pixels">
- Sends inset information about a particular display in the display's native coordinates.
- </description>
- <arg name="inset_left" type="int"/>
- <arg name="inset_top" type="int"/>
- <arg name="inset_right" type="int"/>
- <arg name="inset_bottom" type="int"/>
- </event>
-
- <event name="stable_insets" since="29">
- <description summary="stable insets for a display in pixels">
- Sends stable inset information about a particular display in the display's native
- coordinates.
- </description>
- <arg name="stable_inset_left" type="int"/>
- <arg name="stable_inset_top" type="int"/>
- <arg name="stable_inset_right" type="int"/>
- <arg name="stable_inset_bottom" type="int"/>
- </event>
-
- <event name="systemui_visibility" since="29">
- <description summary="systemui_visibility_state for a display">
- Sends information about whether the systemui is visible. The "systemui_visibility"
- value is of enum type "systemui_visibility_state".
- </description>
- <arg name="systemui_visibility" type="int" summary="systemui_visibility_state enum"/>
- </event>
-
- </interface>
-
</protocol>
