exo: Produce an error if get_keyboard_device_configuration is called with a keyboard object that al…

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>
@@ skipping 3040 matching lines @@
         keyboard_device_configuration_destroy};
 
 ////////////////////////////////////////////////////////////////////////////////
 // keyboard_configuration interface:
 
 void keyboard_configuration_get_keyboard_device_configuration(
     wl_client* client,
     wl_resource* resource,
     uint32_t id,
     wl_resource* keyboard_resource) {
-  // TODO(yhanada): Produce an error if a delegate already exists.
+  if (GetUserDataAs<Keyboard>(keyboard_resource)

[reveman, 2016/12/12 11:52:56]

nit: "Keyboard* keyboard = GetUserDataAs<Keyboard>(keyboard_resource)" above
this to avoid calling GetUserDataAs twice in this function

[yhanada, 2016/12/12 15:44:03]

Done.

+          ->HasDeviceConfigurationDelegate()) {
+    wl_resource_post_error(
+        resource,
+        ZCR_KEYBOARD_CONFIGURATION_V1_ERROR_DEVICE_CONFIGURATION_EXISTS,
+        "keyboard has already been associated with a device configuration "
+        "object");
+    return;
+  }
+
   wl_resource* keyboard_device_configuration_resource = wl_resource_create(
       client, &zcr_keyboard_device_configuration_v1_interface, 1, id);
 
   SetImplementation(
       keyboard_device_configuration_resource,
       &keyboard_device_configuration_implementation,
       base::MakeUnique<WaylandKeyboardDeviceConfigurationDelegate>(
           keyboard_device_configuration_resource,
           GetUserDataAs<Keyboard>(keyboard_resource)));
 }
@@ skipping 48 matching lines @@
                    display_, bind_secure_output);
   wl_global_create(wl_display_.get(), &zcr_alpha_compositing_v1_interface, 1,
                    display_, bind_alpha_compositing);
   wl_global_create(wl_display_.get(), &zcr_remote_shell_v1_interface,
                    remote_shell_version, display_, bind_remote_shell);
   wl_global_create(wl_display_.get(), &zcr_gaming_input_v1_interface, 1,
                    display_, bind_gaming_input);
   wl_global_create(wl_display_.get(), &zcr_stylus_v1_interface, 1, display_,
                    bind_stylus);
   wl_global_create(wl_display_.get(), &zcr_keyboard_configuration_v1_interface,
-                   1, display_, bind_keyboard_configuration);
+                   2, display_, bind_keyboard_configuration);
 }
 
 Server::~Server() {}
 
 // static
 std::unique_ptr<Server> Server::Create(Display* display) {
   std::unique_ptr<Server> server(new Server(display));
 
   char* runtime_dir = getenv("XDG_RUNTIME_DIR");
   if (!runtime_dir) {
@@ skipping 51 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