Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit

Permalink
vm_tools: sommelier: Upgrade to aura-shell v38.
Browse files Browse the repository at this point in the history
https://crrev.com/c/3789170 merely upgraded the protocol definition.
This CL declares support for the newer version.

BUG=b:207430591
TEST=run Borealis and Crostini, verify everything still works; should be a no-op

Change-Id: I022d92aceabdd6cf0b039ae0fb1c4e4788b6efdd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3874370
Commit-Queue: Chloe Pelling <[email protected]>
Tested-by: Chloe Pelling <[email protected]>
Reviewed-by: Nic Hollingum <[email protected]>
Reviewed-by: Lucy Qu <[email protected]>
  • Loading branch information
cpelling authored and Chromeos LUCI committed Sep 13, 2022
1 parent 65d75cf commit cb1cb3c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 13 additions & 1 deletion sommelier-output.cc
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,21 @@ static void sl_aura_output_device_scale_factor(void* data,
host->device_scale_factor = device_scale_factor;
}

static void sl_aura_output_insets(void* data,
struct zaura_output* output,
int top,
int left,
int bottom,
int right) {}

static void sl_aura_output_logical_transform(void* data,
struct zaura_output* output,
int transform) {}

static const struct zaura_output_listener sl_aura_output_listener = {
sl_aura_output_scale, sl_aura_output_connection,
sl_aura_output_device_scale_factor};
sl_aura_output_device_scale_factor, sl_aura_output_insets,
sl_aura_output_logical_transform};

static void sl_destroy_host_output(struct wl_resource* resource) {
struct sl_host_output* host =
Expand Down
2 changes: 1 addition & 1 deletion sommelier.cc
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct sl_data_source {
#define LOCK_SUFFIXLEN 5

#define MIN_AURA_SHELL_VERSION 6
#define MAX_AURA_SHELL_VERSION 10
#define MAX_AURA_SHELL_VERSION 38

const char* net_wm_state_to_string(int i) {
switch (i) {
Expand Down

0 comments on commit cb1cb3c

Please sign in to comment.