Fix software mirror mode on Ozone part 2/2

ash/touch/touch_transformer_controller_unittest.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 "ash/touch/touch_transformer_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/devices/device_data_manager.h"
@@ skipping 59 matching lines @@
       Shell::GetInstance()->touch_transformer_controller();
   ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
 
   device_manager->UpdateTouchInfoForDisplay(
       internal_display_info.id(), internal_display_info.touch_device_id(),
       tt_controller->GetTouchTransform(internal_display_info,
                                        internal_display_info,
                                        internal_touchscreen, fb_size));
 
   device_manager->UpdateTouchInfoForDisplay(
-      external_display_info.id(), external_display_info.touch_device_id(),
+      internal_display_info.id(), external_display_info.touch_device_id(),
       tt_controller->GetTouchTransform(external_display_info,
                                        external_display_info,
                                        external_touchscreen, fb_size));
 
-  EXPECT_EQ(1, device_manager->GetDisplayForTouchDevice(10));
-  EXPECT_EQ(2, device_manager->GetDisplayForTouchDevice(11));
+  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(10));
+  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(11));
 
   // External touch display has the default TouchTransformer.
   float x = 100.0;
   float y = 100.0;
   device_manager->ApplyTouchTransformer(11, &x, &y);
   EXPECT_EQ(100, x);
   EXPECT_EQ(100, y);
 
   // In letterboxing, there is (1-2560*(1200/1920)/1700)/2 = 2.95% of the
   // height on both the top & bottom region of the screen is blank.
@@ skipping 44 matching lines @@
       Shell::GetInstance()->touch_transformer_controller();
   ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
 
   device_manager->UpdateTouchInfoForDisplay(
       internal_display_info.id(), internal_display_info.touch_device_id(),
       tt_controller->GetTouchTransform(internal_display_info,
                                        internal_display_info,
                                        internal_touchscreen, fb_size));
 
   device_manager->UpdateTouchInfoForDisplay(
-      external_display_info.id(), external_display_info.touch_device_id(),
+      internal_display_info.id(), external_display_info.touch_device_id(),
       tt_controller->GetTouchTransform(external_display_info,
                                        external_display_info,
                                        external_touchscreen, fb_size));
 
-  EXPECT_EQ(1, device_manager->GetDisplayForTouchDevice(10));
-  EXPECT_EQ(2, device_manager->GetDisplayForTouchDevice(11));
+  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(10));
+  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(11));
 
   // External touch display has the default TouchTransformer.
   float x = 100.0;
   float y = 100.0;
   device_manager->ApplyTouchTransformer(11, &x, &y);
   EXPECT_EQ(100, x);
   EXPECT_EQ(100, y);
 
   // In pillarboxing, there is (1-768*(1024/768)/1366)/2 = 12.5% of the
   // width on both the left & rigth region of the screen is blank.
@@ skipping 46 matching lines @@
   TouchTransformerController* tt_controller =
       Shell::GetInstance()->touch_transformer_controller();
   ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
 
   device_manager->UpdateTouchInfoForDisplay(
       display1_info.id(), display1_info.touch_device_id(),
       tt_controller->GetTouchTransform(display1_info, display1_info,
                                        display1_touchscreen, fb_size));
 
   device_manager->UpdateTouchInfoForDisplay(
-      display2_info.id(), display2_info.touch_device_id(),
+      display1_info.id(), display2_info.touch_device_id(),
       tt_controller->GetTouchTransform(display1_info, display2_info,
                                        display2_touchscreen, fb_size));
 
-  EXPECT_EQ(1, device_manager->GetDisplayForTouchDevice(10));
-  EXPECT_EQ(2, device_manager->GetDisplayForTouchDevice(11));
+  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(10));
+  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(11));
 
   // Mapping for touch events from display 1's touchscreen:
   // [0, 1920) x [0, 1990) -> [0, 1280) x [0, 850)
   float x = 0.0;
   float y = 0.0;
   device_manager->ApplyTouchTransformer(10, &x, &y);
   EXPECT_NEAR(0, x, 0.5);
   EXPECT_NEAR(0, y, 0.5);
 
   x = 1920.0;
@@ skipping 48 matching lines @@
   device_manager->UpdateTouchInfoForDisplay(
       display1.id(), display1.touch_device_id(),
       tt_controller->GetTouchTransform(display1, display1, touchscreen1,
                                        fb_size));
 
   device_manager->UpdateTouchInfoForDisplay(
       display2.id(), display2.touch_device_id(),
       tt_controller->GetTouchTransform(display2, display2, touchscreen2,
                                        fb_size));
 
-  EXPECT_EQ(1, device_manager->GetDisplayForTouchDevice(5));
-  EXPECT_EQ(2, device_manager->GetDisplayForTouchDevice(6));
+  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(5));
+  EXPECT_EQ(2, device_manager->GetTargetDisplayForTouchDevice(6));
 
   // Mapping for touch events from internal touch display:
   // [0, 2560) x [0, 2428) -> [0, 1366) x [0, 768)
   float x = 0.0;
   float y = 0.0;
   device_manager->ApplyTouchTransformer(5, &x, &y);
   EXPECT_NEAR(0, x, 0.5);
   EXPECT_NEAR(0, y, 0.5);
 
   x = 2559.0;
@@ skipping 35 matching lines @@
       CreateTouchscreenDevice(5, gfx::Size(1001, 1001));
 
   TouchTransformerController* tt_controller =
       Shell::GetInstance()->touch_transformer_controller();
   // Default touchscreen position range is 1001x1001;
   EXPECT_EQ(sqrt((2560.0 * 1600.0) / (1001.0 * 1001.0)),
             tt_controller->GetTouchResolutionScale(display, touch_device));
 }
 
 }  // namespace ash