| 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
|
| new file mode 100644
|
| index 0000000000000000000000000000000000000000..bae235477e99104fe505532d66caeefc3a065fa6
|
| --- /dev/null
|
| +++ b/ash/touch/touch_transformer_controller_unittest.cc
|
| @@ -0,0 +1,200 @@
|
| +// Copyright (c) 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/x/device_data_manager.h"
|
| +#include "ui/gfx/display.h"
|
| +
|
| +namespace ash {
|
| +
|
| +namespace {
|
| +DisplayInfo CreateDisplayInfo(int64 id,
|
| + int touch_device_id,
|
| + const gfx::Rect& bounds) {
|
| + DisplayInfo info(id, "", false);
|
| + info.SetBounds(bounds);
|
| + info.set_touch_device_id(touch_device_id);
|
| + return info;
|
| +}
|
| +} // namespace
|
| +
|
| +typedef test::AshTestBase TouchTransformerControllerTest;
|
| +
|
| +TEST_F(TouchTransformerControllerTest, TouchTransformerMirrorModeLetterboxing) {
|
| + // The internal display has native resolution of 2560x1700, and in
|
| + // mirror mode it is configured as 1920x1200. This is in letterboxing
|
| + // mode.
|
| + DisplayInfo internal_display_info =
|
| + CreateDisplayInfo(1, 10, gfx::Rect(0, 0, 1920, 1200));
|
| + std::vector<DisplayMode> internal_modes;
|
| + internal_modes.push_back(
|
| + DisplayMode(gfx::Size(2560, 1700), 60, false, true));
|
| + internal_modes.push_back(
|
| + DisplayMode(gfx::Size(1920, 1200), 60, false, false));
|
| + internal_display_info.set_display_modes(internal_modes);
|
| +
|
| + DisplayInfo external_display_info =
|
| + CreateDisplayInfo(2, 11, gfx::Rect(0, 0, 1920, 1200));
|
| +
|
| + TouchTransformerController* tt_controller =
|
| + Shell::GetInstance()->touch_transformer_controller();
|
| + ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
|
| +
|
| + tt_controller->force_compute_mirror_mode_touch_transformer_ = true;
|
| + device_manager->UpdateTouchInfoForDisplay(
|
| + internal_display_info,
|
| + tt_controller->GetMirrorModeTouchTransformer(internal_display_info));
|
| +
|
| + tt_controller->force_compute_mirror_mode_touch_transformer_ = false;
|
| + device_manager->UpdateTouchInfoForDisplay(
|
| + external_display_info,
|
| + tt_controller->GetMirrorModeTouchTransformer(external_display_info));
|
| +
|
| + EXPECT_EQ(1, device_manager->GetDisplayForTouchDevice(10));
|
| + EXPECT_EQ(2, device_manager->GetDisplayForTouchDevice(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.
|
| + // When touch events coming at Y range [0, 1200), the mapping should be
|
| + // [0, ~35] ---> < 0
|
| + // [~35, ~1165] ---> [0, 1200)
|
| + // [~1165, 1200] ---> >= 1200
|
| + x = 100.0;
|
| + y = 35.0;
|
| + device_manager->ApplyTouchTransformer(10, &x, &y);
|
| + EXPECT_EQ(100, static_cast<int>(x));
|
| + EXPECT_EQ(0, static_cast<int>(y));
|
| +
|
| + x = 100.0;
|
| + y = 1165.0;
|
| + device_manager->ApplyTouchTransformer(10, &x, &y);
|
| + EXPECT_EQ(100, static_cast<int>(x));
|
| + EXPECT_EQ(1200, static_cast<int>(y));
|
| +}
|
| +
|
| +TEST_F(TouchTransformerControllerTest, TouchTransformerMirrorModePillarboxing) {
|
| + // The internal display has native resolution of 1366x768, and in
|
| + // mirror mode it is configured as 1024x768. This is in pillarboxing
|
| + // mode.
|
| + DisplayInfo internal_display_info =
|
| + CreateDisplayInfo(1, 10, gfx::Rect(0, 0, 1024, 768));
|
| + std::vector<DisplayMode> internal_modes;
|
| + internal_modes.push_back(
|
| + DisplayMode(gfx::Size(1366, 768), 60, false, true));
|
| + internal_modes.push_back(
|
| + DisplayMode(gfx::Size(1024, 768), 60, false, false));
|
| + internal_display_info.set_display_modes(internal_modes);
|
| +
|
| + DisplayInfo external_display_info =
|
| + CreateDisplayInfo(2, 11, gfx::Rect(0, 0, 1024, 768));
|
| +
|
| + TouchTransformerController* tt_controller =
|
| + Shell::GetInstance()->touch_transformer_controller();
|
| + ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
|
| +
|
| + tt_controller->force_compute_mirror_mode_touch_transformer_ = true;
|
| + device_manager->UpdateTouchInfoForDisplay(
|
| + internal_display_info,
|
| + tt_controller->GetMirrorModeTouchTransformer(internal_display_info));
|
| +
|
| + tt_controller->force_compute_mirror_mode_touch_transformer_ = false;
|
| + device_manager->UpdateTouchInfoForDisplay(
|
| + external_display_info,
|
| + tt_controller->GetMirrorModeTouchTransformer(external_display_info));
|
| +
|
| + EXPECT_EQ(1, device_manager->GetDisplayForTouchDevice(10));
|
| + EXPECT_EQ(2, device_manager->GetDisplayForTouchDevice(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.
|
| + // When touch events coming at X range [0, 1024), the mapping should be
|
| + // [0, ~128] ---> < 0
|
| + // [~128, ~896] ---> [0, 1024)
|
| + // [~896, 1024] ---> >= 1024
|
| + x = 128.0;
|
| + y = 100.0;
|
| + device_manager->ApplyTouchTransformer(10, &x, &y);
|
| + EXPECT_EQ(0, static_cast<int>(x));
|
| + EXPECT_EQ(100, static_cast<int>(y));
|
| +
|
| + x = 896.0;
|
| + y = 100.0;
|
| + device_manager->ApplyTouchTransformer(10, &x, &y);
|
| + EXPECT_EQ(1024, static_cast<int>(x));
|
| + EXPECT_EQ(100, static_cast<int>(y));
|
| +}
|
| +
|
| +TEST_F(TouchTransformerControllerTest, TouchTransformerExtendedMode) {
|
| + // The internal display has size 1366 x 768. The external display has
|
| + // size 2560x1600. The total frame buffer is 2560x2428,
|
| + // where 2428 = 768 + 60 (hidden gap) + 1600
|
| + // and the sceond monitor is translated to Point (0, 828) in the
|
| + // framebuffer.
|
| + DisplayInfo display1 = CreateDisplayInfo(1, 5, gfx::Rect(0, 0, 1366, 768));
|
| + DisplayInfo display2 = CreateDisplayInfo(2, 6, gfx::Rect(0, 828, 2560, 1600));
|
| + gfx::Size fb_size(2560, 2428);
|
| +
|
| + TouchTransformerController* tt_controller =
|
| + Shell::GetInstance()->touch_transformer_controller();
|
| + ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
|
| +
|
| + device_manager->UpdateTouchInfoForDisplay(
|
| + display1,
|
| + tt_controller->GetExtendedModeTouchTransformer(display1, fb_size));
|
| +
|
| + device_manager->UpdateTouchInfoForDisplay(
|
| + display2,
|
| + tt_controller->GetExtendedModeTouchTransformer(display2, fb_size));
|
| +
|
| + EXPECT_EQ(1, device_manager->GetDisplayForTouchDevice(5));
|
| + EXPECT_EQ(2, device_manager->GetDisplayForTouchDevice(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_EQ(0, static_cast<int>(x));
|
| + EXPECT_EQ(0, static_cast<int>(y));
|
| +
|
| + x = 2559.0;
|
| + y = 2427.0;
|
| + device_manager->ApplyTouchTransformer(5, &x, &y);
|
| + EXPECT_EQ(1365, static_cast<int>(x));
|
| + EXPECT_EQ(767, static_cast<int>(y));
|
| +
|
| + // Mapping for touch events from external touch display:
|
| + // [0, 2560) x [0, 2428) -> [0, 2560) x [0, 1600)
|
| + x = 0.0;
|
| + y = 0.0;
|
| + device_manager->ApplyTouchTransformer(6, &x, &y);
|
| + EXPECT_EQ(0, static_cast<int>(x));
|
| + EXPECT_EQ(0, static_cast<int>(y));
|
| +
|
| + x = 2559.0;
|
| + y = 2427.0;
|
| + device_manager->ApplyTouchTransformer(6, &x, &y);
|
| + EXPECT_EQ(2559, static_cast<int>(x));
|
| + EXPECT_EQ(1599, static_cast<int>(y));
|
| +}
|
| +
|
| +} // namespace ash
|
|
|