Move touch CTM from X into Chrome

chromeos/display/output_configurator_unittest.cc

 // 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.
 
 #include "chromeos/display/output_configurator.h"
 
 #include <cmath>
 #include <cstdarg>
 #include <map>
 #include <string>
@@ skipping 49 matching lines @@
 // call.
 std::string GetFramebufferAction(int width,
                                  int height,
                                  RRCrtc crtc1,
                                  RRCrtc crtc2) {
   return base::StringPrintf(
       "framebuffer(width=%d,height=%d,crtc1=%lu,crtc2=%lu)",
       width, height, crtc1, crtc2);
 }
 
-// Returns a string describing a TestNativeDisplayDelegate::ConfigureCTM() call.
-std::string GetCTMAction(
-    int device_id,
-    const OutputConfigurator::CoordinateTransformation& ctm) {
-  return base::StringPrintf("ctm(id=%d,transform=(%f,%f,%f,%f))", device_id,
-      ctm.x_scale, ctm.x_offset, ctm.y_scale, ctm.y_offset);
-}
-
 // Returns a string describing a TestNativeDisplayDelegate::SetHDCPState() call.
 std::string GetSetHDCPStateAction(RROutput id, ui::HDCPState state) {
   return base::StringPrintf("set_hdcp(id=%lu,state=%d)", id, state);
 }
 
 // Joins a sequence of strings describing actions (e.g. kScreenDim) such
 // that they can be compared against a string returned by
 // ActionLogger::GetActionsAndClear().  The list of actions must be
 // terminated by a NULL pointer.
 std::string JoinActions(const char* action, ...) {
@@ skipping 35 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ActionLogger);
 };
 
 class TestTouchscreenDelegate : public OutputConfigurator::TouchscreenDelegate {
  public:
   // Ownership of |log| remains with the caller.
   explicit TestTouchscreenDelegate(ActionLogger* log) : log_(log) {}
   virtual ~TestTouchscreenDelegate() {}
 
-  const OutputConfigurator::CoordinateTransformation& GetCTM(
-      int touch_device_id) {
-    return ctms_[touch_device_id];
-  }
-
   // OutputConfigurator::TouchscreenDelegate implementation:
   virtual void AssociateTouchscreens(
       std::vector<OutputConfigurator::OutputSnapshot>* outputs) OVERRIDE {}
-  virtual void ConfigureCTM(
-      int touch_device_id,
-      const OutputConfigurator::CoordinateTransformation& ctm) OVERRIDE {
-    log_->AppendAction(GetCTMAction(touch_device_id, ctm));
-    ctms_[touch_device_id] = ctm;
-  }
 
  private:
   ActionLogger* log_;  // Not owned.
 
-  // Most-recently-configured transformation matrices, keyed by touch device ID.
-  std::map<int, OutputConfigurator::CoordinateTransformation> ctms_;
-
   DISALLOW_COPY_AND_ASSIGN(TestTouchscreenDelegate);
 };
 
 class TestNativeDisplayDelegate : public NativeDisplayDelegate {
  public:
   // Ownership of |log| remains with the caller.
   explicit TestNativeDisplayDelegate(ActionLogger* log)
       : max_configurable_pixels_(0),
         hdcp_state_(ui::HDCP_STATE_UNDESIRED),
         log_(log) {}
@@ skipping 1112 matching lines @@
   EXPECT_EQ(
       GetSetHDCPStateAction(outputs_[1].output, ui::HDCP_STATE_DESIRED).c_str(),
       log_->GetActionsAndClear());
   EXPECT_TRUE(configurator_.EnableOutputProtection(
       client1, outputs_[1].display_id, ui::OUTPUT_PROTECTION_METHOD_NONE));
   EXPECT_EQ(GetSetHDCPStateAction(outputs_[1].output, ui::HDCP_STATE_UNDESIRED)
                 .c_str(),
             log_->GetActionsAndClear());
 }
 
-TEST_F(OutputConfiguratorTest, CTMForMultiScreens) {
-  outputs_[0].touch_device_id = 1;
-  outputs_[1].touch_device_id = 2;
-
-  UpdateOutputs(2, false);
-  configurator_.Init(false);
-  state_controller_.set_state(ui::OUTPUT_STATE_DUAL_EXTENDED);
-  configurator_.ForceInitialConfigure(0);
-
-  const int kDualHeight =
-      kSmallModeHeight + OutputConfigurator::kVerticalGap + kBigModeHeight;
-  const int kDualWidth = kBigModeWidth;
-
-  OutputConfigurator::CoordinateTransformation ctm1 =
-      touchscreen_delegate_->GetCTM(1);
-  OutputConfigurator::CoordinateTransformation ctm2 =
-      touchscreen_delegate_->GetCTM(2);
-
-  EXPECT_EQ(kSmallModeHeight - 1, round((kDualHeight - 1) * ctm1.y_scale));
-  EXPECT_EQ(0, round((kDualHeight - 1) * ctm1.y_offset));
-
-  EXPECT_EQ(kBigModeHeight - 1, round((kDualHeight - 1) * ctm2.y_scale));
-  EXPECT_EQ(kSmallModeHeight + OutputConfigurator::kVerticalGap,
-            round((kDualHeight - 1) * ctm2.y_offset));
-
-  EXPECT_EQ(kSmallModeWidth - 1, round((kDualWidth - 1) * ctm1.x_scale));
-  EXPECT_EQ(0, round((kDualWidth - 1) * ctm1.x_offset));
-
-  EXPECT_EQ(kBigModeWidth - 1, round((kDualWidth - 1) * ctm2.x_scale));
-  EXPECT_EQ(0, round((kDualWidth - 1) * ctm2.x_offset));
-}
-
 TEST_F(OutputConfiguratorTest, HandleConfigureCrtcFailure) {
   InitWithSingleOutput();
 
   // kFirstMode represents the first mode in the list and
   // also the mode that we are requesting the output_configurator
   // to choose.  The test will be setup so that this mode will fail
   // and it will have to choose the next best option.
   const int kFirstMode = 11;
 
   // Give the mode_info lists a few reasonable modes.
@@ skipping 97 matching lines @@
                         outputs_[1].mode_infos[kFirstMode].height +
                             OutputConfigurator::kVerticalGap,
                         kFirstMode + 3,
                         outputs_[1].output).c_str(),
           kUngrab,
           NULL),
       log_->GetActionsAndClear());
 }
 
 }  // namespace chromeos