Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-server-protocol.h

Issue 2352563002: third_party: Remove deprecated zwp wayland interfaces. (Closed)
Patch Set: rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-server-protocol.h
diff --git a/third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-server-protocol.h b/third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-server-protocol.h
index 5730bdbd38edd86d8cbe4926072bc70a2b200b5e..5bcbf949b63443e38a44659fb8716776489ac0b4 100644
--- a/third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-server-protocol.h
+++ b/third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-server-protocol.h
@@ -44,8 +44,6 @@ struct wl_resource;
* @section page_ifaces_secure_output_unstable_v1 Interfaces
* - @subpage page_iface_zcr_secure_output_v1 - secure output
* - @subpage page_iface_zcr_security_v1 - security interface to a wl_surface
- * - @subpage page_iface_zwp_secure_output_v1 - DEPRECATED
- * - @subpage page_iface_zwp_security_v1 - DEPRECATED
* @section page_copyright_secure_output_unstable_v1 Copyright
* <pre>
*
@@ -74,8 +72,6 @@ struct wl_resource;
struct wl_surface;
struct zcr_secure_output_v1;
struct zcr_security_v1;
-struct zwp_secure_output_v1;
-struct zwp_security_v1;
/**
* @page page_iface_zcr_secure_output_v1 zcr_secure_output_v1
@@ -129,58 +125,6 @@ extern const struct wl_interface zcr_secure_output_v1_interface;
* wl_surface.commit.
*/
extern const struct wl_interface zcr_security_v1_interface;
-/**
- * @page page_iface_zwp_secure_output_v1 zwp_secure_output_v1
- * @section page_iface_zwp_secure_output_v1_desc Description
- *
- * The global interface exposing secure output capabilities is used
- * to instantiate an interface extension for a wl_surface object.
- * This extended interface will then allow surfaces to be marked as
- * as only visible on secure outputs.
- * @section page_iface_zwp_secure_output_v1_api API
- * See @ref iface_zwp_secure_output_v1.
- */
-/**
- * @defgroup iface_zwp_secure_output_v1 The zwp_secure_output_v1 interface
- *
- * The global interface exposing secure output capabilities is used
- * to instantiate an interface extension for a wl_surface object.
- * This extended interface will then allow surfaces to be marked as
- * as only visible on secure outputs.
- */
-extern const struct wl_interface zwp_secure_output_v1_interface;
-/**
- * @page page_iface_zwp_security_v1 zwp_security_v1
- * @section page_iface_zwp_security_v1_desc Description
- *
- * An additional interface to a wl_surface object, which allows the
- * client to specify that a surface should not appear in screenshots
- * or be visible on non-secure outputs.
- *
- * If the wl_surface associated with the security object is destroyed,
- * the security object becomes inert.
- *
- * If the security object is destroyed, the security state is removed
- * from the wl_surface. The change will be applied on the next
- * wl_surface.commit.
- * @section page_iface_zwp_security_v1_api API
- * See @ref iface_zwp_security_v1.
- */
-/**
- * @defgroup iface_zwp_security_v1 The zwp_security_v1 interface
- *
- * An additional interface to a wl_surface object, which allows the
- * client to specify that a surface should not appear in screenshots
- * or be visible on non-secure outputs.
- *
- * If the wl_surface associated with the security object is destroyed,
- * the security object becomes inert.
- *
- * If the security object is destroyed, the security state is removed
- * from the wl_surface. The change will be applied on the next
- * wl_surface.commit.
- */
-extern const struct wl_interface zwp_security_v1_interface;
#ifndef ZCR_SECURE_OUTPUT_V1_ERROR_ENUM
#define ZCR_SECURE_OUTPUT_V1_ERROR_ENUM
@@ -250,74 +194,6 @@ struct zcr_security_v1_interface {
};
-#ifndef ZWP_SECURE_OUTPUT_V1_ERROR_ENUM
-#define ZWP_SECURE_OUTPUT_V1_ERROR_ENUM
-enum zwp_secure_output_v1_error {
- /**
- * the surface already has a security object associated
- */
- ZWP_SECURE_OUTPUT_V1_ERROR_SECURITY_EXISTS = 0,
-};
-#endif /* ZWP_SECURE_OUTPUT_V1_ERROR_ENUM */
-
-/**
- * @ingroup iface_zwp_secure_output_v1
- * @struct zwp_secure_output_v1_interface
- */
-struct zwp_secure_output_v1_interface {
- /**
- * unbind from the secure output interface
- *
- * Informs the server that the client will not be using this
- * protocol object anymore. This does not affect any other objects,
- * security objects included.
- */
- void (*destroy)(struct wl_client *client,
- struct wl_resource *resource);
- /**
- * extend surface interface for security
- *
- * Instantiate an interface extension for the given wl_surface to
- * provide surface security. If the given wl_surface already has a
- * security object associated, the security_exists protocol error
- * is raised.
- * @param id the new security interface id
- * @param surface the surface
- */
- void (*get_security)(struct wl_client *client,
- struct wl_resource *resource,
- uint32_t id,
- struct wl_resource *surface);
-};
-
-
-/**
- * @ingroup iface_zwp_security_v1
- * @struct zwp_security_v1_interface
- */
-struct zwp_security_v1_interface {
- /**
- * remove security from the surface
- *
- * The associated wl_surface's security state is removed. The
- * change is applied on the next wl_surface.commit.
- */
- void (*destroy)(struct wl_client *client,
- struct wl_resource *resource);
- /**
- * set the only visible on secure output state
- *
- * Constrain visibility of wl_surface contents to secure outputs.
- * See wp_secure_output for the description.
- *
- * The only visible on secure output state is double-buffered
- * state, and will be applied on the next wl_surface.commit.
- */
- void (*only_visible_on_secure_output)(struct wl_client *client,
- struct wl_resource *resource);
-};
-
-
#ifdef __cplusplus
}
#endif

Powered by Google App Engine
This is Rietveld 408576698