exo: Remove support for scaler interface from wayland bindings.

This is no longer used and has been replaced by the viewporter
interface.

BUG=549781

Review-Url: https://codereview.chromium.org/2030023003
Cr-Commit-Position: refs/heads/master@{#397791}

components/exo.gypi

@@ -73,7 +73,6 @@
             '../skia/skia.gyp:skia',
             '../third_party/wayland-protocols/wayland-protocols.gyp:alpha_compositing_protocol',
             '../third_party/wayland-protocols/wayland-protocols.gyp:remote_shell_protocol',
-            '../third_party/wayland-protocols/wayland-protocols.gyp:scaler_protocol',
             '../third_party/wayland-protocols/wayland-protocols.gyp:secure_output_protocol',
             '../third_party/wayland-protocols/wayland-protocols.gyp:viewporter_protocol',
             '../third_party/wayland-protocols/wayland-protocols.gyp:xdg_shell_protocol',

components/exo/wayland/BUILD.gn

@@ -36,7 +36,6 @@ source_set("wayland") {
     "//third_party/wayland:wayland_server",
     "//third_party/wayland-protocols:alpha_compositing_protocol",
     "//third_party/wayland-protocols:remote_shell_protocol",
-    "//third_party/wayland-protocols:scaler_protocol",
     "//third_party/wayland-protocols:secure_output_protocol",
     "//third_party/wayland-protocols:viewporter_protocol",
     "//third_party/wayland-protocols:xdg_shell_protocol",

components/exo/wayland/server.cc

@@ -15,7 +15,6 @@
 // Note: core wayland headers need to be included before protocol headers.
 #include <alpha-compositing-unstable-v1-server-protocol.h>  // NOLINT
 #include <remote-shell-unstable-v1-server-protocol.h>       // NOLINT
-#include <scaler-server-protocol.h>                         // NOLINT
 #include <secure-output-unstable-v1-server-protocol.h>      // NOLINT
 #include <xdg-shell-unstable-v5-server-protocol.h>          // NOLINT
 
@@ -2194,110 +2193,6 @@ void bind_viewporter(wl_client* client,
                                  nullptr);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// wl_viewport_interface:
-
-void viewport_destroy_DEPRECATED(wl_client* client, wl_resource* resource) {
-  wl_resource_destroy(resource);
-}
-
-void viewport_set_DEPRECATED(wl_client* client,
-                             wl_resource* resource,
-                             wl_fixed_t src_x,
-                             wl_fixed_t src_y,
-                             wl_fixed_t src_width,
-                             wl_fixed_t src_height,
-                             int32_t dst_width,
-                             int32_t dst_height) {
-  NOTIMPLEMENTED();
-}
-
-void viewport_set_source_DEPRECATED(wl_client* client,
-                                    wl_resource* resource,
-                                    wl_fixed_t x,
-                                    wl_fixed_t y,
-                                    wl_fixed_t width,
-                                    wl_fixed_t height) {
-  if (x == wl_fixed_from_int(-1) && y == wl_fixed_from_int(-1) &&
-      width == wl_fixed_from_int(-1) && height == wl_fixed_from_int(-1)) {
-    GetUserDataAs<Viewport>(resource)->SetSource(gfx::RectF());
-    return;
-  }
-
-  if (x < 0 || y < 0 || width <= 0 || height <= 0) {
-    wl_resource_post_error(resource, WL_VIEWPORT_ERROR_BAD_VALUE,
-                           "source rectangle must be non-empty (%dx%d) and"
-                           "have positive origin (%d,%d)",
-                           width, height, x, y);
-    return;
-  }
-
-  GetUserDataAs<Viewport>(resource)->SetSource(
-      gfx::RectF(wl_fixed_to_double(x), wl_fixed_to_double(y),
-                 wl_fixed_to_double(width), wl_fixed_to_double(height)));
-}
-
-void viewport_set_destination_DEPRECATED(wl_client* client,
-                                         wl_resource* resource,
-                                         int32_t width,
-                                         int32_t height) {
-  if (width == -1 && height == -1) {
-    GetUserDataAs<Viewport>(resource)->SetDestination(gfx::Size());
-    return;
-  }
-
-  if (width <= 0 || height <= 0) {
-    wl_resource_post_error(resource, WL_VIEWPORT_ERROR_BAD_VALUE,
-                           "destination size must be positive (%dx%d)", width,
-                           height);
-    return;
-  }
-
-  GetUserDataAs<Viewport>(resource)->SetDestination(gfx::Size(width, height));
-}
-
-const struct wl_viewport_interface viewport_implementation_DEPRECATED = {
-    viewport_destroy_DEPRECATED, viewport_set_DEPRECATED,
-    viewport_set_source_DEPRECATED, viewport_set_destination_DEPRECATED};
-
-////////////////////////////////////////////////////////////////////////////////
-// wl_scaler_interface:
-
-void scaler_destroy(wl_client* client, wl_resource* resource) {
-  wl_resource_destroy(resource);
-}
-
-void scaler_get_viewport(wl_client* client,
-                         wl_resource* resource,
-                         uint32_t id,
-                         wl_resource* surface_resource) {
-  Surface* surface = GetUserDataAs<Surface>(surface_resource);
-  if (surface->GetProperty(kSurfaceHasViewportKey)) {
-    wl_resource_post_error(resource, WL_SCALER_ERROR_VIEWPORT_EXISTS,
-                           "a viewport for that surface already exists");
-    return;
-  }
-
-  wl_resource* viewport_resource = wl_resource_create(
-      client, &wl_viewport_interface, wl_resource_get_version(resource), id);
-
-  SetImplementation(viewport_resource, &viewport_implementation_DEPRECATED,
-                    base::WrapUnique(new Viewport(surface)));
-}
-
-const struct wl_scaler_interface scaler_implementation = {scaler_destroy,
-                                                          scaler_get_viewport};
-
-const uint32_t scaler_version = 2;
-
-void bind_scaler(wl_client* client, void* data, uint32_t version, uint32_t id) {
-  wl_resource* resource = wl_resource_create(
-      client, &wl_scaler_interface, std::min(version, scaler_version), id);
-
-  wl_resource_set_implementation(resource, &scaler_implementation, data,
-                                 nullptr);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // security_interface:
 
@@ -2535,8 +2430,6 @@ Server::Server(Display* display)
                    display_, bind_seat);
   wl_global_create(wl_display_.get(), &wp_viewporter_interface, 1, display_,
                    bind_viewporter);
-  wl_global_create(wl_display_.get(), &wl_scaler_interface, scaler_version,
-                   display_, bind_scaler);
   wl_global_create(wl_display_.get(), &zwp_secure_output_v1_interface, 1,
                    display_, bind_secure_output);
   wl_global_create(wl_display_.get(), &zwp_alpha_compositing_v1_interface, 1,

third_party/wayland-protocols/BUILD.gn

@@ -65,27 +65,6 @@ source_set("viewporter_protocol") {
   public_configs = [ ":viewporter_protocol_config" ]
 }
 
-config("scaler_protocol_config") {
-  include_dirs = [ "include/protocol" ]
-}
-
-source_set("scaler_protocol") {
-  sources = [
-    "include/protocol/scaler-client-protocol.h",
-    "include/protocol/scaler-server-protocol.h",
-    "protocol/scaler-protocol.c",
-  ]
-
-  deps = [
-    "//third_party/wayland:wayland_util",
-  ]
-
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
-
-  public_configs = [ ":scaler_protocol_config" ]
-}
-
 config("secure_output_protocol_config") {
   include_dirs = [ "include/protocol" ]
 }

third_party/wayland-protocols/README.chromium

@@ -25,9 +25,6 @@ To import a new snapshot of wayland-protocols:
     wayland-scanner code < src/*/viewporter/viewporter.xml > protocol/viewporter-protocol.c
     wayland-scanner server-header < src/stable/viewporter/viewporter.xml > include/protocol/viewporter-server-protocol.h
     wayland-scanner client-header < src/stable/viewporter/viewporter.xml > include/protocol/viewporter-client-protocol.h
-    wayland-scanner code < */scaler/scaler.xml > protocol/scaler-protocol.c
-    wayland-scanner server-header < unstable/scaler/scaler.xml > include/protocol/scaler-server-protocol.h
-    wayland-scanner client-header < unstable/scaler/scaler.xml > include/protocol/scaler-client-protocol.h
     wayland-scanner code < */secure-output/secure-output-unstable-v1.xml > protocol/secure-output-protocol.c
     wayland-scanner server-header < unstable/secure-output/secure-output-unstable-v1.xml > include/protocol/secure-output-unstable-v1-server-protocol.h
     wayland-scanner client-header < unstable/secure-output/secure-output-unstable-v1.xml > include/protocol/secure-output-unstable-v1-client-protocol.h

third_party/wayland-protocols/include/protocol/scaler-client-protocol.h

-/*
- * Copyright © 2013-2014 Collabora, Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * 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
- * 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
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SCALER_CLIENT_PROTOCOL_H
-#define SCALER_CLIENT_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-client.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct wl_scaler;
-struct wl_surface;
-struct wl_viewport;
-
-extern const struct wl_interface wl_scaler_interface;
-extern const struct wl_interface wl_viewport_interface;
-
-#ifndef WL_SCALER_ERROR_ENUM
-#define WL_SCALER_ERROR_ENUM
-enum wl_scaler_error {
-	WL_SCALER_ERROR_VIEWPORT_EXISTS = 0,
-};
-#endif /* WL_SCALER_ERROR_ENUM */
-
-#define WL_SCALER_DESTROY	0
-#define WL_SCALER_GET_VIEWPORT	1
-
-#define WL_SCALER_DESTROY_SINCE_VERSION	1
-#define WL_SCALER_GET_VIEWPORT_SINCE_VERSION	1
-
-static inline void
-wl_scaler_set_user_data(struct wl_scaler *wl_scaler, void *user_data)
-{
-	wl_proxy_set_user_data((struct wl_proxy *) wl_scaler, user_data);
-}
-
-static inline void *
-wl_scaler_get_user_data(struct wl_scaler *wl_scaler)
-{
-	return wl_proxy_get_user_data((struct wl_proxy *) wl_scaler);
-}
-
-static inline uint32_t
-wl_scaler_get_version(struct wl_scaler *wl_scaler)
-{
-	return wl_proxy_get_version((struct wl_proxy *) wl_scaler);
-}
-
-static inline void
-wl_scaler_destroy(struct wl_scaler *wl_scaler)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_scaler,
-			 WL_SCALER_DESTROY);
-
-	wl_proxy_destroy((struct wl_proxy *) wl_scaler);
-}
-
-static inline struct wl_viewport *
-wl_scaler_get_viewport(struct wl_scaler *wl_scaler, struct wl_surface *surface)
-{
-	struct wl_proxy *id;
-
-	id = wl_proxy_marshal_constructor((struct wl_proxy *) wl_scaler,
-			 WL_SCALER_GET_VIEWPORT, &wl_viewport_interface, NULL, surface);
-
-	return (struct wl_viewport *) id;
-}
-
-#ifndef WL_VIEWPORT_ERROR_ENUM
-#define WL_VIEWPORT_ERROR_ENUM
-enum wl_viewport_error {
-	WL_VIEWPORT_ERROR_BAD_VALUE = 0,
-};
-#endif /* WL_VIEWPORT_ERROR_ENUM */
-
-#define WL_VIEWPORT_DESTROY	0
-#define WL_VIEWPORT_SET	1
-#define WL_VIEWPORT_SET_SOURCE	2
-#define WL_VIEWPORT_SET_DESTINATION	3
-
-#define WL_VIEWPORT_DESTROY_SINCE_VERSION	1
-#define WL_VIEWPORT_SET_SINCE_VERSION	1
-#define WL_VIEWPORT_SET_SOURCE_SINCE_VERSION	2
-#define WL_VIEWPORT_SET_DESTINATION_SINCE_VERSION	2
-
-static inline void
-wl_viewport_set_user_data(struct wl_viewport *wl_viewport, void *user_data)
-{
-	wl_proxy_set_user_data((struct wl_proxy *) wl_viewport, user_data);
-}
-
-static inline void *
-wl_viewport_get_user_data(struct wl_viewport *wl_viewport)
-{
-	return wl_proxy_get_user_data((struct wl_proxy *) wl_viewport);
-}
-
-static inline uint32_t
-wl_viewport_get_version(struct wl_viewport *wl_viewport)
-{
-	return wl_proxy_get_version((struct wl_proxy *) wl_viewport);
-}
-
-static inline void
-wl_viewport_destroy(struct wl_viewport *wl_viewport)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_viewport,
-			 WL_VIEWPORT_DESTROY);
-
-	wl_proxy_destroy((struct wl_proxy *) wl_viewport);
-}
-
-static inline void
-wl_viewport_set(struct wl_viewport *wl_viewport, wl_fixed_t src_x, wl_fixed_t src_y, wl_fixed_t src_width, wl_fixed_t src_height, int32_t dst_width, int32_t dst_height)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_viewport,
-			 WL_VIEWPORT_SET, src_x, src_y, src_width, src_height, dst_width, dst_height);
-}
-
-static inline void
-wl_viewport_set_source(struct wl_viewport *wl_viewport, wl_fixed_t x, wl_fixed_t y, wl_fixed_t width, wl_fixed_t height)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_viewport,
-			 WL_VIEWPORT_SET_SOURCE, x, y, width, height);
-}
-
-static inline void
-wl_viewport_set_destination(struct wl_viewport *wl_viewport, int32_t width, int32_t height)
-{
-	wl_proxy_marshal((struct wl_proxy *) wl_viewport,
-			 WL_VIEWPORT_SET_DESTINATION, width, height);
-}
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

third_party/wayland-protocols/include/protocol/scaler-server-protocol.h

-/*
- * Copyright © 2013-2014 Collabora, Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * 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
- * 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
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SCALER_SERVER_PROTOCOL_H
-#define SCALER_SERVER_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-server.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct wl_scaler;
-struct wl_surface;
-struct wl_viewport;
-
-extern const struct wl_interface wl_scaler_interface;
-extern const struct wl_interface wl_viewport_interface;
-
-#ifndef WL_SCALER_ERROR_ENUM
-#define WL_SCALER_ERROR_ENUM
-enum wl_scaler_error {
-	WL_SCALER_ERROR_VIEWPORT_EXISTS = 0,
-};
-#endif /* WL_SCALER_ERROR_ENUM */
-
-/**
- * wl_scaler - surface cropping and scaling
- * @destroy: unbind from the cropping and scaling interface
- * @get_viewport: extend surface interface for crop and scale
- *
- * The global interface exposing surface cropping and scaling
- * capabilities is used to instantiate an interface extension for a
- * wl_surface object. This extended interface will then allow cropping and
- * scaling the surface contents, effectively disconnecting the direct
- * relationship between the buffer and the surface size.
- */
-struct wl_scaler_interface {
-	/**
-	 * destroy - unbind from the cropping and scaling interface
-	 *
-	 * Informs the server that the client will not be using this
-	 * protocol object anymore. This does not affect any other objects,
-	 * wl_viewport objects included.
-	 */
-	void (*destroy)(struct wl_client *client,
-			struct wl_resource *resource);
-	/**
-	 * get_viewport - extend surface interface for crop and scale
-	 * @id: the new viewport interface id
-	 * @surface: the surface
-	 *
-	 * Instantiate an interface extension for the given wl_surface to
-	 * crop and scale its content. If the given wl_surface already has
-	 * a wl_viewport object associated, the viewport_exists protocol
-	 * error is raised.
-	 */
-	void (*get_viewport)(struct wl_client *client,
-			     struct wl_resource *resource,
-			     uint32_t id,
-			     struct wl_resource *surface);
-};
-
-
-#ifndef WL_VIEWPORT_ERROR_ENUM
-#define WL_VIEWPORT_ERROR_ENUM
-enum wl_viewport_error {
-	WL_VIEWPORT_ERROR_BAD_VALUE = 0,
-};
-#endif /* WL_VIEWPORT_ERROR_ENUM */
-
-/**
- * wl_viewport - crop and scale interface to a wl_surface
- * @destroy: remove scaling and cropping from the surface
- * @set: set the crop and scale state
- * @set_source: set the source rectangle for cropping
- * @set_destination: set the surface size for scaling
- *
- * An additional interface to a wl_surface object, which allows the
- * client to specify the cropping and scaling of the surface contents.
- *
- * This interface allows to define the source rectangle (src_x, src_y,
- * src_width, src_height) from where to take the wl_buffer contents, and
- * scale that to destination size (dst_width, dst_height). This state is
- * double-buffered, and is applied on the next wl_surface.commit.
- *
- * The two parts of crop and scale state are independent: the source
- * rectangle, and the destination size. Initially both are unset, that is,
- * no scaling is applied. The whole of the current wl_buffer is used as the
- * source, and the surface size is as defined in wl_surface.attach.
- *
- * If the destination size is set, it causes the surface size to become
- * dst_width, dst_height. The source (rectangle) is scaled to exactly this
- * size. This overrides whatever the attached wl_buffer size is, unless the
- * wl_buffer is NULL. If the wl_buffer is NULL, the surface has no content
- * and therefore no size. Otherwise, the size is always at least 1x1 in
- * surface coordinates.
- *
- * If the source rectangle is set, it defines what area of the wl_buffer is
- * taken as the source. If the source rectangle is set and the destination
- * size is not set, the surface size becomes the source rectangle size
- * rounded up to the nearest integer. If the source size is already exactly
- * integers, this results in cropping without scaling.
- *
- * The coordinate transformations from buffer pixel coordinates up to the
- * surface-local coordinates happen in the following order: 1.
- * buffer_transform (wl_surface.set_buffer_transform) 2. buffer_scale
- * (wl_surface.set_buffer_scale) 3. crop and scale (wl_viewport.set*) This
- * means, that the source rectangle coordinates of crop and scale are given
- * in the coordinates after the buffer transform and scale, i.e. in the
- * coordinates that would be the surface-local coordinates if the crop and
- * scale was not applied.
- *
- * If the source rectangle is partially or completely outside of the
- * wl_buffer, then the surface contents are undefined (not void), and the
- * surface size is still dst_width, dst_height.
- *
- * The x, y arguments of wl_surface.attach are applied as normal to the
- * surface. They indicate how many pixels to remove from the surface size
- * from the left and the top. In other words, they are still in the
- * surface-local coordinate system, just like dst_width and dst_height are.
- *
- * If the wl_surface associated with the wl_viewport is destroyed, the
- * wl_viewport object becomes inert.
- *
- * If the wl_viewport object is destroyed, the crop and scale state is
- * removed from the wl_surface. The change will be applied on the next
- * wl_surface.commit.
- */
-struct wl_viewport_interface {
-	/**
-	 * destroy - remove scaling and cropping from the surface
-	 *
-	 * The associated wl_surface's crop and scale state is removed.
-	 * The change is applied on the next wl_surface.commit.
-	 */
-	void (*destroy)(struct wl_client *client,
-			struct wl_resource *resource);
-	/**
-	 * set - set the crop and scale state
-	 * @src_x: source rectangle x
-	 * @src_y: source rectangle y
-	 * @src_width: source rectangle width
-	 * @src_height: source rectangle height
-	 * @dst_width: surface width
-	 * @dst_height: surface height
-	 *
-	 * Set both source rectangle and destination size of the
-	 * associated wl_surface. See wl_viewport for the description, and
-	 * relation to the wl_buffer size.
-	 *
-	 * The bad_value protocol error is raised if src_width or
-	 * src_height is negative, or if dst_width or dst_height is not
-	 * positive.
-	 *
-	 * The crop and scale state is double-buffered state, and will be
-	 * applied on the next wl_surface.commit.
-	 *
-	 * Arguments dst_x and dst_y do not exist here, use the x and y
-	 * arguments to wl_surface.attach. The x, y, dst_width, and
-	 * dst_height define the surface-local coordinate system
-	 * irrespective of the attached wl_buffer size.
-	 */
-	void (*set)(struct wl_client *client,
-		    struct wl_resource *resource,
-		    wl_fixed_t src_x,
-		    wl_fixed_t src_y,
-		    wl_fixed_t src_width,
-		    wl_fixed_t src_height,
-		    int32_t dst_width,
-		    int32_t dst_height);
-	/**
-	 * set_source - set the source rectangle for cropping
-	 * @x: source rectangle x
-	 * @y: source rectangle y
-	 * @width: source rectangle width
-	 * @height: source rectangle height
-	 *
-	 * Set the source rectangle of the associated wl_surface. See
-	 * wl_viewport for the description, and relation to the wl_buffer
-	 * size.
-	 *
-	 * If width is -1.0 and height is -1.0, the source rectangle is
-	 * unset instead. Any other pair of values for width and height
-	 * that contains zero or negative values raises the bad_value
-	 * protocol error.
-	 *
-	 * The crop and scale state is double-buffered state, and will be
-	 * applied on the next wl_surface.commit.
-	 * @since: 2
-	 */
-	void (*set_source)(struct wl_client *client,
-			   struct wl_resource *resource,
-			   wl_fixed_t x,
-			   wl_fixed_t y,
-			   wl_fixed_t width,
-			   wl_fixed_t height);
-	/**
-	 * set_destination - set the surface size for scaling
-	 * @width: surface width
-	 * @height: surface height
-	 *
-	 * Set the destination size of the associated wl_surface. See
-	 * wl_viewport for the description, and relation to the wl_buffer
-	 * size.
-	 *
-	 * If width is -1 and height is -1, the destination size is unset
-	 * instead. Any other pair of values for width and height that
-	 * contains zero or negative values raises the bad_value protocol
-	 * error.
-	 *
-	 * The crop and scale state is double-buffered state, and will be
-	 * applied on the next wl_surface.commit.
-	 *
-	 * Arguments x and y do not exist here, use the x and y arguments
-	 * to wl_surface.attach. The x, y, width, and height define the
-	 * surface-local coordinate system irrespective of the attached
-	 * wl_buffer size.
-	 * @since: 2
-	 */
-	void (*set_destination)(struct wl_client *client,
-				struct wl_resource *resource,
-				int32_t width,
-				int32_t height);
-};
-
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

third_party/wayland-protocols/protocol/scaler-protocol.c

-/*
- * Copyright © 2013-2014 Collabora, Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * 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
- * 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
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-extern const struct wl_interface wl_surface_interface;
-extern const struct wl_interface wl_viewport_interface;
-
-static const struct wl_interface *types[] = {
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	&wl_viewport_interface,
-	&wl_surface_interface,
-};
-
-static const struct wl_message wl_scaler_requests[] = {
-	{ "destroy", "", types + 0 },
-	{ "get_viewport", "no", types + 6 },
-};
-
-WL_EXPORT const struct wl_interface wl_scaler_interface = {
-	"wl_scaler", 2,
-	2, wl_scaler_requests,
-	0, NULL,
-};
-
-static const struct wl_message wl_viewport_requests[] = {
-	{ "destroy", "", types + 0 },
-	{ "set", "ffffii", types + 0 },
-	{ "set_source", "2ffff", types + 0 },
-	{ "set_destination", "2ii", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface wl_viewport_interface = {
-	"wl_viewport", 2,
-	4, wl_viewport_requests,
-	0, NULL,
-};
-

third_party/wayland-protocols/unstable/scaler/scaler.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="scaler">
-
-  <copyright>
-    Copyright © 2013-2014 Collabora, Ltd.
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice (including the next
-    paragraph) shall be included in all copies or substantial portions of the
-    Software.
-
-    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
-    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
-    DEALINGS IN THE SOFTWARE.
-  </copyright>
-
-  <interface name="wl_scaler" version="2">
-    <description summary="surface cropping and scaling">
-      The global interface exposing surface cropping and scaling
-      capabilities is used to instantiate an interface extension for a
-      wl_surface object. This extended interface will then allow
-      cropping and scaling the surface contents, effectively
-      disconnecting the direct relationship between the buffer and the
-      surface size.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="unbind from the cropping and scaling interface">
-	Informs the server that the client will not be using this
-	protocol object anymore. This does not affect any other objects,
-	wl_viewport objects included.
-      </description>
-    </request>
-
-    <enum name="error">
-      <entry name="viewport_exists" value="0"
-             summary="the surface already has a viewport object associated"/>
-    </enum>
-
-    <request name="get_viewport">
-      <description summary="extend surface interface for crop and scale">
-	Instantiate an interface extension for the given wl_surface to
-	crop and scale its content. If the given wl_surface already has
-	a wl_viewport object associated, the viewport_exists
-	protocol error is raised.
-      </description>
-
-      <arg name="id" type="new_id" interface="wl_viewport"
-           summary="the new viewport interface id"/>
-      <arg name="surface" type="object" interface="wl_surface"
-           summary="the surface"/>
-    </request>
-  </interface>
-
-  <interface name="wl_viewport" version="2">
-    <description summary="crop and scale interface to a wl_surface">
-      An additional interface to a wl_surface object, which allows the
-      client to specify the cropping and scaling of the surface
-      contents.
-
-      This interface allows to define the source rectangle (src_x,
-      src_y, src_width, src_height) from where to take the wl_buffer
-      contents, and scale that to destination size (dst_width,
-      dst_height). This state is double-buffered, and is applied on the
-      next wl_surface.commit.
-
-      The two parts of crop and scale state are independent: the source
-      rectangle, and the destination size. Initially both are unset, that
-      is, no scaling is applied. The whole of the current wl_buffer is
-      used as the source, and the surface size is as defined in
-      wl_surface.attach.
-
-      If the destination size is set, it causes the surface size to become
-      dst_width, dst_height. The source (rectangle) is scaled to exactly
-      this size. This overrides whatever the attached wl_buffer size is,
-      unless the wl_buffer is NULL. If the wl_buffer is NULL, the surface
-      has no content and therefore no size. Otherwise, the size is always
-      at least 1x1 in surface coordinates.
-
-      If the source rectangle is set, it defines what area of the
-      wl_buffer is taken as the source. If the source rectangle is set and
-      the destination size is not set, the surface size becomes the source
-      rectangle size rounded up to the nearest integer. If the source size
-      is already exactly integers, this results in cropping without scaling.
-
-      The coordinate transformations from buffer pixel coordinates up to
-      the surface-local coordinates happen in the following order:
-        1. buffer_transform (wl_surface.set_buffer_transform)
-        2. buffer_scale (wl_surface.set_buffer_scale)
-        3. crop and scale (wl_viewport.set*)
-      This means, that the source rectangle coordinates of crop and scale
-      are given in the coordinates after the buffer transform and scale,
-      i.e. in the coordinates that would be the surface-local coordinates
-      if the crop and scale was not applied.
-
-      If the source rectangle is partially or completely outside of the
-      wl_buffer, then the surface contents are undefined (not void), and
-      the surface size is still dst_width, dst_height.
-
-      The x, y arguments of wl_surface.attach are applied as normal to
-      the surface. They indicate how many pixels to remove from the
-      surface size from the left and the top. In other words, they are
-      still in the surface-local coordinate system, just like dst_width
-      and dst_height are.
-
-      If the wl_surface associated with the wl_viewport is destroyed,
-      the wl_viewport object becomes inert.
-
-      If the wl_viewport object is destroyed, the crop and scale
-      state is removed from the wl_surface. The change will be applied
-      on the next wl_surface.commit.
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="remove scaling and cropping from the surface">
-	The associated wl_surface's crop and scale state is removed.
-	The change is applied on the next wl_surface.commit.
-      </description>
-    </request>
-
-    <enum name="error">
-      <entry name="bad_value" value="0"
-             summary="negative or zero values in width or height"/>
-    </enum>
-
-    <request name="set">
-      <description summary="set the crop and scale state">
-	Set both source rectangle and destination size of the associated
-	wl_surface. See wl_viewport for the description, and relation to
-	the wl_buffer size.
-
-	The bad_value protocol error is raised if src_width or
-	src_height is negative, or if dst_width or dst_height is not
-	positive.
-
-	The crop and scale state is double-buffered state, and will be
-	applied on the next wl_surface.commit.
-
-	Arguments dst_x and dst_y do not exist here, use the x and y
-	arguments to wl_surface.attach. The x, y, dst_width, and dst_height
-	define the surface-local coordinate system irrespective of the
-	attached wl_buffer size.
-      </description>
-
-      <arg name="src_x" type="fixed" summary="source rectangle x"/>
-      <arg name="src_y" type="fixed" summary="source rectangle y"/>
-      <arg name="src_width" type="fixed" summary="source rectangle width"/>
-      <arg name="src_height" type="fixed" summary="source rectangle height"/>
-      <arg name="dst_width" type="int" summary="surface width"/>
-      <arg name="dst_height" type="int" summary="surface height"/>
-    </request>
-
-    <request name="set_source" since="2">
-      <description summary="set the source rectangle for cropping">
-	Set the source rectangle of the associated wl_surface. See
-	wl_viewport for the description, and relation to the wl_buffer
-	size.
-
-	If width is -1.0 and height is -1.0, the source rectangle is unset
-	instead. Any other pair of values for width and height that
-	contains zero or negative values raises the bad_value protocol
-	error.
-
-	The crop and scale state is double-buffered state, and will be
-	applied on the next wl_surface.commit.
-      </description>
-
-      <arg name="x" type="fixed" summary="source rectangle x"/>
-      <arg name="y" type="fixed" summary="source rectangle y"/>
-      <arg name="width" type="fixed" summary="source rectangle width"/>
-      <arg name="height" type="fixed" summary="source rectangle height"/>
-    </request>
-
-    <request name="set_destination" since="2">
-      <description summary="set the surface size for scaling">
-	Set the destination size of the associated wl_surface. See
-	wl_viewport for the description, and relation to the wl_buffer
-	size.
-
-	If width is -1 and height is -1, the destination size is unset
-	instead. Any other pair of values for width and height that
-	contains zero or negative values raises the bad_value protocol
-	error.
-
-	The crop and scale state is double-buffered state, and will be
-	applied on the next wl_surface.commit.
-
-	Arguments x and y do not exist here, use the x and y arguments to
-	wl_surface.attach. The x, y, width, and height define the
-	surface-local coordinate system irrespective of the attached
-	wl_buffer size.
-      </description>
-
-      <arg name="width" type="int" summary="surface width"/>
-      <arg name="height" type="int" summary="surface height"/>
-    </request>
-  </interface>
-</protocol>

third_party/wayland-protocols/wayland-protocols.gyp

@@ -44,26 +44,6 @@
         ],
       },
     },
-    {
-      'target_name': 'scaler_protocol',
-      'type': 'static_library',
-      'dependencies' : [
-        '../wayland/wayland.gyp:wayland_util',
-      ],
-      'sources': [
-        'include/protocol/scaler-client-protocol.h',
-        'include/protocol/scaler-server-protocol.h',
-        'protocol/scaler-protocol.c',
-      ],
-      'include_dirs': [
-        'include/protocol',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          'include/protocol',
-        ],
-      },
-    },
     {
       'target_name': 'viewporter_protocol',
       'type': 'static_library',