Move touch CTM from X into Chrome

ui/aura/window_tree_host.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_AURA_WINDOW_TREE_HOST_H_
 #define UI_AURA_WINDOW_TREE_HOST_H_
 
 #include <vector>
 
 #include "base/event_types.h"
@@ skipping 96 matching lines @@
   void OnCursorVisibilityChanged(bool visible);
 
   // Moves the cursor to the specified location relative to the root window.
   void MoveCursorTo(const gfx::Point& location);
 
   // Moves the cursor to the |host_location| given in host coordinates.
   void MoveCursorToHostLocation(const gfx::Point& host_location);
 
   gfx::NativeCursor last_cursor() const { return last_cursor_; }
 
+  void UpdateDisplayID(int64 id1, int64 id2) {
+    display_ids_.first = id1;
+    display_ids_.second = id2;
+  }
+
+  const std::pair<int64, int64>& display_ids() const {
+    return display_ids_;
+  }
+
   // Returns the accelerated widget.
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0;
 
   // Shows the WindowTreeHost.
   virtual void Show() = 0;
 
   // Hides the WindowTreeHost.
   virtual void Hide() = 0;
 
   // Toggles the host's full screen state.
@@ skipping 84 matching lines @@
 
   scoped_ptr<ui::Compositor> compositor_;
 
   scoped_ptr<RootWindowTransformer> transformer_;
 
   // Last cursor set.  Used for testing.
   gfx::NativeCursor last_cursor_;
 
   scoped_ptr<ui::ViewProp> prop_;
 
+  // The display IDs associated with this root window.
+  // In single monitor or extended mode dual monitor case, the root window
+  // is associated with one display.
+  // In mirror mode dual monitors case, the root window is associated with
+  // both displays.
+  std::pair<int64, int64> display_ids_;

[oshima, 2014/03/14 21:53:53]

Instead of adding these information and code in the WTH, how about
adding aura::client::TouchCalibrateClient ?

[Ben Goodger (Google), 2014/03/24 19:36:55]

And if this code is only used from ash, some code that lives there? i.e. no aura
client interface at all.

[oshima, 2014/03/24 20:00:10]

Sorry I probably wasn't clear. This is used from aura in this CL (see
WindowTreeHostX11::IsTouchEventTargetingThisRootWindow), and
my suggestion is to move entire calibration code (TouchEventCalibrate etc)
out from aura because it's very chromeos specific.

+
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_TREE_HOST_H_