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 13 matching lines @@
 // static
 DeviceDataManager* DeviceDataManager::instance_ = NULL;
 
 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_radius_scale_map_[i] = 1.0;
-  }
+  ClearTouchDeviceAssociations();
 }
 
 DeviceDataManager::~DeviceDataManager() {
   CHECK_EQ(this, instance_);
   instance_ = NULL;
 }
 
 // static
 DeviceDataManager* DeviceDataManager::instance() { return instance_; }
 
 // static
 void DeviceDataManager::CreateInstance() {
   if (instance())
     return;
 
   new DeviceDataManager();
 }
 
 // static
 DeviceDataManager* DeviceDataManager::GetInstance() {
   CHECK(instance_) << "DeviceDataManager was not created.";
   return instance_;
 }
 
 // static
 bool DeviceDataManager::HasInstance() {
   return instance_ != NULL;
 }
 
-void DeviceDataManager::ClearTouchTransformerRecord() {
+void DeviceDataManager::ClearTouchDeviceAssociations() {
+  touch_device_to_display_map_.clear();
+
   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);
 }
 
 void DeviceDataManager::UpdateTouchInfoForDisplay(
-    int64_t display_id,
+    const gfx::Display& display,
     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_to_display_map_[touch_device_id] = display;
     touch_device_transformer_map_[touch_device_id] = touch_transformer;
   }
 }
 
 void DeviceDataManager::UpdateTouchRadiusScale(unsigned int touch_device_id,
                                                double scale) {
   if (IsTouchDeviceIdValid(touch_device_id))
     touch_radius_scale_map_[touch_device_id] = scale;
 }
 
 void DeviceDataManager::ApplyTouchRadiusScale(unsigned int touch_device_id,
                                               double* radius) {
   if (IsTouchDeviceIdValid(touch_device_id))
     *radius = (*radius) * touch_radius_scale_map_[touch_device_id];
 }
 
 void DeviceDataManager::ApplyTouchTransformer(unsigned int touch_device_id,
                                               float* x,
                                               float* y) {
   if (IsTouchDeviceIdValid(touch_device_id)) {
     gfx::Point3F point(*x, *y, 0.0);
     const gfx::Transform& trans =
         touch_device_transformer_map_[touch_device_id];
     trans.TransformPoint(&point);
     *x = point.x();
     *y = point.y();
   }
 }
 
-int64_t DeviceDataManager::GetDisplayForTouchDevice(
+gfx::Display 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;
+  if (!IsTouchDeviceIdValid(touch_device_id))
+    return gfx::Display();
+
+  std::map<unsigned int, gfx::Display>::const_iterator it =
+      touch_device_to_display_map_.find(touch_device_id);
+  return it == touch_device_to_display_map_.end() ? gfx::Display() : it->second;
 }
 
 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;
@@ skipping 35 matching lines @@
 
 void DeviceDataManager::AddObserver(InputDeviceEventObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void DeviceDataManager::RemoveObserver(InputDeviceEventObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace ui