Re-land "Issue 191223007: Move touch CTM from X into Chrome"

ui/display/chromeos/display_configurator_unittest.cc

 // Copyright 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 "ui/display/chromeos/display_configurator.h"
 
 #include <stdint.h>
 
 #include <cmath>
 #include <cstdarg>
@@ skipping 64 matching lines @@
                                  const DisplaySnapshot* out1,
                                  const DisplaySnapshot* out2) {
   return base::StringPrintf(
       "framebuffer(width=%d,height=%d,display1=%s,display2=%s)",
       size.width(),
       size.height(),
       out1 ? DisplaySnapshotToString(*out1).c_str() : "NULL",
       out2 ? DisplaySnapshotToString(*out2).c_str() : "NULL");
 }
 
-// Returns a string describing a TestNativeDisplayDelegate::ConfigureCTM() call.
-std::string GetCTMAction(
-    int device_id,
-    const DisplayConfigurator::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(const DisplaySnapshot& output,
                                   HDCPState state) {
   return base::StringPrintf(
       "set_hdcp(id=%" PRId64 ",state=%d)", output.display_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
@@ skipping 40 matching lines @@
 
 class TestTouchscreenDelegate
     : public DisplayConfigurator::TouchscreenDelegate {
  public:
   // Ownership of |log| remains with the caller.
   explicit TestTouchscreenDelegate(ActionLogger* log)
       : log_(log),
         configure_touchscreens_(false) {}
   virtual ~TestTouchscreenDelegate() {}
 
-  const DisplayConfigurator::CoordinateTransformation& GetCTM(
-      int touch_device_id) {
-    return ctms_[touch_device_id];
-  }
-
   void set_configure_touchscreens(bool state) {
     configure_touchscreens_ = state;
   }
 
   // DisplayConfigurator::TouchscreenDelegate implementation:
   virtual void AssociateTouchscreens(
       DisplayConfigurator::DisplayStateList* outputs) OVERRIDE {
     if (configure_touchscreens_) {
       for (size_t i = 0; i < outputs->size(); ++i)
         (*outputs)[i].touch_device_id = i + 1;
     }
   }
-  virtual void ConfigureCTM(
-      int touch_device_id,
-      const DisplayConfigurator::CoordinateTransformation& ctm) OVERRIDE {
-    log_->AppendAction(GetCTMAction(touch_device_id, ctm));
-    ctms_[touch_device_id] = ctm;
-  }
 
  private:
   ActionLogger* log_;  // Not owned.
 
   bool configure_touchscreens_;
 
-  // Most-recently-configured transformation matrices, keyed by touch device ID.
-  std::map<int, DisplayConfigurator::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_(HDCP_STATE_UNDESIRED),
         log_(log) {}
@@ skipping 1036 matching lines @@
   EXPECT_TRUE(configurator_.EnableContentProtection(
       client2, outputs_[1].display_id(), CONTENT_PROTECTION_METHOD_NONE));
   EXPECT_EQ(GetSetHDCPStateAction(outputs_[1], HDCP_STATE_DESIRED).c_str(),
             log_->GetActionsAndClear());
   EXPECT_TRUE(configurator_.EnableContentProtection(
       client1, outputs_[1].display_id(), CONTENT_PROTECTION_METHOD_NONE));
   EXPECT_EQ(GetSetHDCPStateAction(outputs_[1], HDCP_STATE_UNDESIRED).c_str(),
             log_->GetActionsAndClear());
 }
 
-TEST_F(DisplayConfiguratorTest, CTMForMultiScreens) {
-  touchscreen_delegate_->set_configure_touchscreens(true);
-  UpdateOutputs(2, false);
-  configurator_.Init(false);
-  state_controller_.set_state(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);
-  configurator_.ForceInitialConfigure(0);
-
-  const int kDualHeight = small_mode_.size().height() +
-                          DisplayConfigurator::kVerticalGap +
-                          big_mode_.size().height();
-  const int kDualWidth = big_mode_.size().width();
-
-  DisplayConfigurator::CoordinateTransformation ctm1 =
-      touchscreen_delegate_->GetCTM(1);
-  DisplayConfigurator::CoordinateTransformation ctm2 =
-      touchscreen_delegate_->GetCTM(2);
-
-  EXPECT_EQ(small_mode_.size().height() - 1,
-            round((kDualHeight - 1) * ctm1.y_scale));
-  EXPECT_EQ(0, round((kDualHeight - 1) * ctm1.y_offset));
-
-  EXPECT_EQ(big_mode_.size().height() - 1,
-            round((kDualHeight - 1) * ctm2.y_scale));
-  EXPECT_EQ(small_mode_.size().height() + DisplayConfigurator::kVerticalGap,
-            round((kDualHeight - 1) * ctm2.y_offset));
-
-  EXPECT_EQ(small_mode_.size().width() - 1,
-            round((kDualWidth - 1) * ctm1.x_scale));
-  EXPECT_EQ(0, round((kDualWidth - 1) * ctm1.x_offset));
-
-  EXPECT_EQ(big_mode_.size().width() - 1,
-            round((kDualWidth - 1) * ctm2.x_scale));
-  EXPECT_EQ(0, round((kDualWidth - 1) * ctm2.x_offset));
-}
-
 TEST_F(DisplayConfiguratorTest, HandleConfigureCrtcFailure) {
   InitWithSingleOutput();
 
   ScopedVector<const DisplayMode> modes;
   // The first mode is the mode we are requesting DisplayConfigurator to choose.
   // The test will be setup so that this mode will fail and it will have to
   // choose the next best option.
   modes.push_back(new DisplayMode(gfx::Size(2560, 1600), false, 60.0));
   modes.push_back(new DisplayMode(gfx::Size(1024, 768), false, 60.0));
   modes.push_back(new DisplayMode(gfx::Size(1280, 720), false, 60.0));
@@ skipping 69 matching lines @@
                         gfx::Point(0,
                                    modes[0]->size().height() +
                                        DisplayConfigurator::kVerticalGap))
               .c_str(),
           kUngrab,
           NULL),
       log_->GetActionsAndClear());
 }
 
 }  // namespace ui