diff options
author | Jim Sun <jimsun@google.com> | 2019-11-04 06:53:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-04 06:53:31 +0000 |
commit | e39fcc9651a5d915679af3ec9337fc7590e70115 (patch) | |
tree | 288361f6d173b2e494403c8e78e103eef05b3f57 | |
parent | fe5cab37e4383e7f343ae4798f641c24f089338a (diff) | |
parent | 45a5fe91a359510168757b57bed03d09f8676d71 (diff) | |
download | wayland-protocols-e39fcc9651a5d915679af3ec9337fc7590e70115.tar.gz |
Merge "Revert "Sync chromium wayland protocol with Chrome""
-rw-r--r-- | chromium.org/unstable/keyboard/keyboard-extension-unstable-v1.xml | 3 | ||||
-rw-r--r-- | chromium.org/unstable/remote-shell/remote-shell-unstable-v1.xml | 24 |
2 files changed, 4 insertions, 23 deletions
diff --git a/chromium.org/unstable/keyboard/keyboard-extension-unstable-v1.xml b/chromium.org/unstable/keyboard/keyboard-extension-unstable-v1.xml index 9527678..a90604d 100644 --- a/chromium.org/unstable/keyboard/keyboard-extension-unstable-v1.xml +++ b/chromium.org/unstable/keyboard/keyboard-extension-unstable-v1.xml @@ -60,8 +60,7 @@ <description summary="extension of wl_keyboard protocol"> The zcr_extended_keyboard_v1 interface extends the wl_keyboard interface with requests to notify whether sent key events are handled or not by - the client. If no such an acknowledgment request is sent in a specified - amount of time, then the event is assumed to be handled. + the client. </description> <request name="destroy" type="destructor"> 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 8407d6c..0f63df6 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="23"> + <interface name="zcr_remote_shell_v1" version="20"> <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 @@ -199,7 +199,7 @@ <event name="display_info" since="19"> <description summary="extra display information"> [Deprecated] Sends display size in pixels and display identification data, typically - in EDID format. Preceded by a "workspace" event for the same display. + in EDID format. Followed by a "workspace_info" event for the same display. </description> <arg name="display_id_hi" type="uint"/> <arg name="display_id_lo" type="uint"/> @@ -237,7 +237,7 @@ </interface> - <interface name="zcr_remote_surface_v1" version="23"> + <interface name="zcr_remote_surface_v1" version="20"> <description summary="A desktop window"> An interface that may be implemented by a wl_surface, for implementations that provide a desktop-style user interface @@ -694,7 +694,6 @@ summary="the window bounds is moved due to other WM operations"/> <entry name="resize" value="6" summary="the window bounds is reiszed due to other WM operations"/> - <entry name="move_pip" value="7" summary="the window bounds is resized for PIP"/> </enum> <event name="bounds_changed" since="10"> @@ -1016,23 +1015,6 @@ description of set_ime_blocked for detail. </description> </request> - - <!-- Version 23 additions --> - <enum name="zoom_change"> - <description summary="zoom level change"> - Zoom level change. - </description> - <entry name="in" value="0" summary="zoom in"/> - <entry name="out" value="1" summary="zoom out"/> - <entry name="reset" value="2" summary="reset zoom level"/> - </enum> - - <event name="change_zoom_level" since="23"> - <description summary="change zoom level"> - Request application zoom level change. - </description> - <arg name="change" type="int" summary="zoom_change"/> - </event> </interface> <interface name="zcr_notification_surface_v1" version="16"> |