| Index: ash/touch/touch_transformer_controller_unittest.cc
|
| diff --git a/ash/touch/touch_transformer_controller_unittest.cc b/ash/touch/touch_transformer_controller_unittest.cc
|
| index ca64baa4789ca35379dda2ab1a445c65e5bb21a5..cff2c5356e8f481bd2c64a505374a39cb0ce1518 100644
|
| --- a/ash/touch/touch_transformer_controller_unittest.cc
|
| +++ b/ash/touch/touch_transformer_controller_unittest.cc
|
| @@ -8,6 +8,7 @@
|
| #include "ash/test/ash_test_base.h"
|
| #include "ui/aura/window_tree_host.h"
|
| #include "ui/events/device_data_manager.h"
|
| +#include "ui/events/test/events_test_utils_x11.h"
|
| #include "ui/gfx/display.h"
|
|
|
| namespace ash {
|
| @@ -203,4 +204,17 @@ TEST_F(TouchTransformerControllerTest, TouchTransformerExtendedMode) {
|
| EXPECT_EQ(1599, static_cast<int>(y));
|
| }
|
|
|
| +TEST_F(TouchTransformerControllerTest, TouchRadiusScale) {
|
| + DisplayInfo display = CreateDisplayInfo(1, 5, gfx::Rect(0, 0, 2560, 1600));
|
| + std::vector<unsigned int> devices;
|
| + devices.push_back(5);
|
| + ui::SetUpTouchDevicesForTest(devices);
|
| +
|
| + 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));
|
| +}
|
| +
|
| } // namespace ash
|
|
|