[automerger skipped] Uprev remote-shell and aura-shell am: bbf4f4a902 am: e205336340 am: 27d1154c08 -s ours
am skip reason: Merged-In I048d5c73d72d29fe98d6270e8ede3399ddf5ba0a with SHA-1 0b7bd42213 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/wayland-protocols/+/2803613
Change-Id: Ic000a52529d4eea8d3a7e540a7c5b051b334ab15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml b/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml
index dec0247..8c334a4 100644
--- a/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml
+++ b/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml
@@ -162,7 +162,7 @@
</interface>
- <interface name="zcr_remote_surface_v2" version="5">
+ <interface name="zcr_remote_surface_v2" version="6">
<description summary="A desktop window">
An interface that may be implemented by a wl_surface, for
implementations that provide a desktop-style user interface
@@ -596,6 +596,7 @@
<entry name="shadow" value="2" summary="shadow only"/>
<entry name="autohide" value="3" summary="autohide frame with shadow"/>
<entry name="overlay" value="4" summary="overlay frame with shadow"/>
+ <entry name="overlap" value="5" summary="overlap frame with the window" since="6"/>
</enum>
<request name="set_frame" since="1">
@@ -934,7 +935,7 @@
</request>
</interface>
- <interface name="zcr_toast_surface_v2" version="1">
+ <interface name="zcr_toast_surface_v2" version="2">
<description summary="A toast window">
An interface that may be implemented by a wl_surface to host
toast contents.
@@ -968,6 +969,21 @@
<arg name="width" type="int"/>
<arg name="height" type="int"/>
</request>
+
+ <!-- Version 2 additions -->
+ <request name="set_scale_factor" since="2">
+ <description summary="Allows the client to set the scale factor for the future buffer commits.">
+ The client has a 32-bit float scale factor that is associated with each
+ remote surface. This scale factor must be propagated exactly to exo. To
+ do so we reinterpret_cast into a 32-bit uint and later cast back into a
+ float. This is because wayland does not support native transport of
+ floats. As different CPU architectures may use different endian
+ representations for IEEE 754 floats, this protocol implicitly assumes
+ that the caller and receiver are the same machine.
+ This is double buffered state and will be applied in the next commit.
+ </description>
+ <arg name="scale_factor_as_uint" type="uint"/>
+ </request>
</interface>
<interface name="zcr_remote_output_v2" version="1">
