Move touch CTM from X into Chrome

ui/aura/window_tree_host_x11_unittest.cc

 // Copyright 2013 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 "base/sys_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host_delegate.h"
@@ skipping 101 matching lines @@
   std::vector<unsigned int> devices;
   devices.push_back(0);
   ui::SetUpTouchDevicesForTest(devices);
   std::vector<ui::Valuator> valuators;
 
   EXPECT_EQ(ui::ET_UNKNOWN, delegate->last_touch_type());
   EXPECT_EQ(-1, delegate->last_touch_id());
 
   ui::ScopedXI2Event scoped_xevent;
 #if defined(OS_CHROMEOS)
-  // This touch is out of bounds.
+  // This touch device does not have TouchCTM stored in the root window.
+  // So touch event is discarded.
   scoped_xevent.InitTouchEvent(
       0, XI_TouchBegin, 5, gfx::Point(1500, 2500), valuators);
   window_tree_host->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_UNKNOWN, delegate->last_touch_type());
   EXPECT_EQ(-1, delegate->last_touch_id());
   EXPECT_EQ(gfx::Point(0, 0), delegate->last_touch_location());
 #endif  // defined(OS_CHROMEOS)
 
+  // Make the touchscreen 0 associated with the root window.
+  window_tree_host->SetTouchCTM(0, TouchCTM());
+
   // Following touchs are within bounds and are passed to delegate.
   scoped_xevent.InitTouchEvent(
       0, XI_TouchBegin, 5, gfx::Point(1500, 1500), valuators);
   window_tree_host->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_TOUCH_PRESSED, delegate->last_touch_type());
   EXPECT_EQ(0, delegate->last_touch_id());
   EXPECT_EQ(gfx::Point(1500, 1500), delegate->last_touch_location());
 
   scoped_xevent.InitTouchEvent(
       0, XI_TouchUpdate, 5, gfx::Point(1500, 1600), valuators);
@@ skipping 43 matching lines @@
   std::vector<unsigned int> devices;
   devices.push_back(0);
   ui::SetUpTouchDevicesForTest(devices);
   std::vector<ui::Valuator> valuators;
 
   EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type());
   EXPECT_EQ(-1, delegate1->last_touch_id());
   EXPECT_EQ(ui::ET_UNKNOWN, delegate2->last_touch_type());
   EXPECT_EQ(-1, delegate2->last_touch_id());
 
+  // Make the touchscreen 0 associated with the second root window.
+  window_tree_host2->SetTouchCTM(0, TouchCTM());
+
   // 2 Touch events are targeted at the second WindowTreeHost.
   ui::ScopedXI2Event scoped_xevent;
   scoped_xevent.InitTouchEvent(
       0, XI_TouchBegin, 5, gfx::Point(1500, 2500), valuators);
   window_tree_host1->Dispatch(scoped_xevent);
   window_tree_host2->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type());
   EXPECT_EQ(-1, delegate1->last_touch_id());
   EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location());
   EXPECT_EQ(ui::ET_TOUCH_PRESSED, delegate2->last_touch_type());
@@ skipping 63 matching lines @@
 
   // Revert the CrOS testing env otherwise the following non-CrOS aura
   // tests will fail.
   // Fake a ChromeOS running env.
   kLsbRelease = "";
   base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace aura