| Index: third_party/wayland-protocols/protocol/secure-output-protocol.c
|
| diff --git a/third_party/wayland-protocols/protocol/scaler-protocol.c b/third_party/wayland-protocols/protocol/secure-output-protocol.c
|
| similarity index 65%
|
| copy from third_party/wayland-protocols/protocol/scaler-protocol.c
|
| copy to third_party/wayland-protocols/protocol/secure-output-protocol.c
|
| index 861b312641ab82c96eba478764e11de572d2edb5..264f5cb689dafc0fa05c98cca828af5b062a106c 100644
|
| --- a/third_party/wayland-protocols/protocol/scaler-protocol.c
|
| +++ b/third_party/wayland-protocols/protocol/secure-output-protocol.c
|
| @@ -1,5 +1,5 @@
|
| /*
|
| - * Copyright © 2013-2014 Collabora, Ltd.
|
| + * Copyright 2016 The Chromium Authors.
|
| *
|
| * Permission is hereby granted, free of charge, to any person obtaining a
|
| * copy of this software and associated documentation files (the "Software"),
|
| @@ -14,7 +14,7 @@
|
| *
|
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
| - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
| + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
| * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
| * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
| @@ -26,40 +26,32 @@
|
| #include "wayland-util.h"
|
|
|
| extern const struct wl_interface wl_surface_interface;
|
| -extern const struct wl_interface wl_viewport_interface;
|
| +extern const struct wl_interface zwp_security_v1_interface;
|
|
|
| static const struct wl_interface *types[] = {
|
| - NULL,
|
| - NULL,
|
| - NULL,
|
| - NULL,
|
| - NULL,
|
| - NULL,
|
| - &wl_viewport_interface,
|
| + &zwp_security_v1_interface,
|
| &wl_surface_interface,
|
| };
|
|
|
| -static const struct wl_message wl_scaler_requests[] = {
|
| +static const struct wl_message zwp_secure_output_v1_requests[] = {
|
| { "destroy", "", types + 0 },
|
| - { "get_viewport", "no", types + 6 },
|
| + { "get_security", "no", types + 0 },
|
| };
|
|
|
| -WL_EXPORT const struct wl_interface wl_scaler_interface = {
|
| - "wl_scaler", 2,
|
| - 2, wl_scaler_requests,
|
| +WL_EXPORT const struct wl_interface zwp_secure_output_v1_interface = {
|
| + "zwp_secure_output_v1", 1,
|
| + 2, zwp_secure_output_v1_requests,
|
| 0, NULL,
|
| };
|
|
|
| -static const struct wl_message wl_viewport_requests[] = {
|
| +static const struct wl_message zwp_security_v1_requests[] = {
|
| { "destroy", "", types + 0 },
|
| - { "set", "ffffii", types + 0 },
|
| - { "set_source", "2ffff", types + 0 },
|
| - { "set_destination", "2ii", types + 0 },
|
| + { "only_visible_on_secure_output", "", types + 0 },
|
| };
|
|
|
| -WL_EXPORT const struct wl_interface wl_viewport_interface = {
|
| - "wl_viewport", 2,
|
| - 4, wl_viewport_requests,
|
| +WL_EXPORT const struct wl_interface zwp_security_v1_interface = {
|
| + "zwp_security_v1", 1,
|
| + 2, zwp_security_v1_requests,
|
| 0, NULL,
|
| };
|
|
|
|
|