Fix software mirror mode on Ozone part 2/2

ui/events/devices/device_data_manager.cc

 // Copyright 2014 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 "ui/events/devices/device_data_manager.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/events/devices/input_device_event_observer.h"
@@ skipping 15 matching lines @@
 
 DeviceDataManager::DeviceDataManager() {
   CHECK(!instance_) << "Can not create multiple instances of DeviceDataManager";
   instance_ = this;
 
   base::AtExitManager::RegisterTask(
       base::Bind(&base::DeletePointer<DeviceDataManager>, this));
 
   for (int i = 0; i < kMaxDeviceNum; ++i) {
     touch_device_to_display_map_[i] = gfx::Display::kInvalidDisplayID;
+    touch_device_to_destination_display_map_[i] =
+        gfx::Display::kInvalidDisplayID;
     touch_radius_scale_map_[i] = 1.0;
   }
 }
 
 DeviceDataManager::~DeviceDataManager() {
   CHECK_EQ(this, instance_);
   instance_ = NULL;
 }
 
 // static
@@ skipping 21 matching lines @@
 void DeviceDataManager::ClearTouchTransformerRecord() {
   for (int i = 0; i < kMaxDeviceNum; i++) {
     touch_device_transformer_map_[i] = gfx::Transform();
     touch_device_to_display_map_[i] = gfx::Display::kInvalidDisplayID;
     touch_radius_scale_map_[i] = 1.0;
   }
 }
 
 bool DeviceDataManager::IsTouchDeviceIdValid(
     unsigned int touch_device_id) const {
   return (touch_device_id > 0 && touch_device_id < kMaxDeviceNum);

[oshima, 2015/02/27 02:37:43]

optional: it may be safer to reset the table entry if it's not valid.

[pkotwicz, 2015/02/27 02:47:06]

My understanding is that there is no table entry if the touch device id is not
valid

[oshima, 2015/02/27 20:45:31]

this is just a array, not map right? anyway, if this isn't an issue, then please
ignore.

[pkotwicz, 2015/03/01 16:04:00]

I don't think I understand your concern

We check whether the touch device id is valid because we use the id as the index
into |touch_device_to_destination_display_map_|. If the touch device id is
invalid, there isn't an entry in |touch_device_to_destination_display_map_| for
the id.

 }
 
 void DeviceDataManager::UpdateTouchInfoForDisplay(
     int64_t display_id,
     unsigned int touch_device_id,
     const gfx::Transform& touch_transformer) {
   if (IsTouchDeviceIdValid(touch_device_id)) {
     touch_device_to_display_map_[touch_device_id] = display_id;
     touch_device_transformer_map_[touch_device_id] = touch_transformer;
   }
@@ skipping 24 matching lines @@
   }
 }
 
 int64_t DeviceDataManager::GetDisplayForTouchDevice(
     unsigned int touch_device_id) const {
   if (IsTouchDeviceIdValid(touch_device_id))
     return touch_device_to_display_map_[touch_device_id];
   return gfx::Display::kInvalidDisplayID;
 }
 
+void DeviceDataManager::SetDestinationDisplayForTouchDevice(
+    unsigned int touch_device_id,
+    int64_t destination_display_id) {
+  if (IsTouchDeviceIdValid(touch_device_id)) {
+    touch_device_to_destination_display_map_[touch_device_id] =
+        destination_display_id;
+  }
+}
+
+int64_t DeviceDataManager::GetDestinationDisplayForTouchDevice(
+    unsigned int touch_device_id) {
+  if (IsTouchDeviceIdValid(touch_device_id))
+    return touch_device_to_destination_display_map_[touch_device_id];
+  return gfx::Display::kInvalidDisplayID;
+}
+
 void DeviceDataManager::OnTouchscreenDevicesUpdated(
     const std::vector<TouchscreenDevice>& devices) {
   if (devices.size() == touchscreen_devices_.size() &&
       std::equal(devices.begin(),
                  devices.end(),
                  touchscreen_devices_.begin(),
                  InputDeviceEquals)) {
     return;
   }
   touchscreen_devices_ = devices;
@@ skipping 33 matching lines @@
 
 void DeviceDataManager::AddObserver(InputDeviceEventObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void DeviceDataManager::RemoveObserver(InputDeviceEventObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace ui