exo: Remove support for scaler interface from wayland bindings.

components/exo/wayland/server.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/exo/wayland/server.h"
 
 #include <grp.h>
 #include <linux/input.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <viewporter-server-protocol.h>
 #include <wayland-server-core.h>
 #include <wayland-server-protocol-core.h>
 
 // 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
 
 #include <algorithm>
 #include <iterator>
 #include <string>
 #include <utility>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/display/display_info.h"
@@ skipping 2159 matching lines @@
                      uint32_t version,
                      uint32_t id) {
   wl_resource* resource =
       wl_resource_create(client, &wp_viewporter_interface, 1, id);
 
   wl_resource_set_implementation(resource, &viewporter_implementation, data,
                                  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:
 
 // Implements the security interface to a Surface. The "only visible on secure
 // output"-state is set to false upon destruction. A window property will be set
 // during the lifetime of this class to prevent multiple instances from being
 // created for the same Surface.
 class Security : public SurfaceObserver {
  public:
   explicit Security(Surface* surface) : surface_(surface) {
     surface_->AddSurfaceObserver(this);
@@ skipping 216 matching lines @@
   wl_global_create(wl_display_.get(), &wl_output_interface, output_version,
                    display_, bind_output);
   wl_global_create(wl_display_.get(), &xdg_shell_interface, 1, display_,
                    bind_xdg_shell);
   wl_global_create(wl_display_.get(), &wl_data_device_manager_interface, 1,
                    display_, bind_data_device_manager);
   wl_global_create(wl_display_.get(), &wl_seat_interface, seat_version,
                    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,
                    display_, bind_alpha_compositing);
   wl_global_create(wl_display_.get(), &zwp_remote_shell_v1_interface, 1,
                    display_, bind_remote_shell);
 }
 
 Server::~Server() {}
 
@@ skipping 57 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo