Merge "Revert "Revert "Sync chromium wayland protocol with Chrome"""

2 files changed, 23 insertions, 4 deletions

diff --git a/chromium.org/unstable/keyboard/keyboard-extension-unstable-v1.xml b/chromium.org/unstable/keyboard/keyboard-extension-unstable-v1.xml
index a90604d..9527678 100644
--- a/chromium.org/unstable/keyboard/keyboard-extension-unstable-v1.xml
+++ b/chromium.org/unstable/keyboard/keyboard-extension-unstable-v1.xml
@@ -60,7 +60,8 @@
     <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.
+      the client. If no such an acknowledgment request is sent in a specified
+      amount of time, then the event is assumed to be handled.
     </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 0f63df6..8407d6c 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="20">
+  <interface name="zcr_remote_shell_v1" version="23">
     <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. Followed by a "workspace_info" event for the same display.
+	in EDID format. Preceded by a "workspace" 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="20">
+  <interface name="zcr_remote_surface_v1" version="23">
     <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,6 +694,7 @@
 	     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">
@@ -1015,6 +1016,23 @@
 	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">