Add full touch support to mus.

services/ui/display/screen_manager_ozone.cc

 // Copyright 2016 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 "services/ui/display/screen_manager_ozone.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/system/devicemode.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/display/manager/chromeos/display_change_observer.h"
+#include "ui/display/manager/chromeos/touch_transform_controller.h"
 #include "ui/display/manager/display_layout_store.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/screen.h"
 #include "ui/display/screen_base.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/fake_display_controller.h"
 #include "ui/display/types/native_display_delegate.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/ozone/public/ozone_platform.h"
 
@@ skipping 29 matching lines @@
 std::unique_ptr<ScreenManager> ScreenManager::Create() {
   return base::MakeUnique<ScreenManagerOzone>();
 }
 
 ScreenManagerOzone::ScreenManagerOzone() {}
 
 ScreenManagerOzone::~ScreenManagerOzone() {
   // We are shutting down and don't want to make anymore display changes.
   fake_display_controller_ = nullptr;
 
+  if (touch_transform_controller_)

[msw, 2017/01/10 19:43:27]

optional nit: check is not necessary

[kylechar, 2017/01/10 22:12:18]

Done.

+    touch_transform_controller_.reset();
+
   if (display_manager_)
     display_manager_->RemoveObserver(this);
 
   if (display_change_observer_) {
     display_configurator_.RemoveObserver(display_change_observer_.get());
     display_change_observer_.reset();
   }
 
   if (display_manager_)
     display_manager_.reset();
@@ skipping 97 matching lines @@
   // We want display configuration to happen even off device to keep the control
   // flow similar.
   display_configurator_.set_configure_display(true);
   display_configurator_.AddObserver(display_change_observer_.get());
   display_configurator_.set_state_controller(display_change_observer_.get());
   display_configurator_.set_mirroring_controller(display_manager_.get());
 
   // Perform initial configuration.
   display_configurator_.Init(std::move(native_display_delegate_), false);
   display_configurator_.ForceInitialConfigure(kChromeOsBootColor);
+
+  touch_transform_controller_ = base::MakeUnique<TouchTransformController>(

[msw, 2017/01/10 19:43:27]

I don't get results for TouchTransformController in codesearch or grepping my
local repo, and I don't know touch code well. Otherwise, your CL otherwise looks
fine; I just can't approve without some idea of what you're instantiating here
(and how it compares with the removed TouchController).

[kylechar, 2017/01/10 22:12:18]

The current class is ash::TouchTransformerController, it's renamed in the parent
CL. I'm assuming there used to be some class TouchTransformer that no longer
exists because there are class/method names that reference it. The code now just
uses gfx::Transform instead, so I changed the manager class name too.

TouchController was a hacky version of TouchTransformerController I wrote that
to get pixel touchscreen working.

[msw, 2017/01/10 22:36:57]

Acknowledged; thanks for pointing out the change dependency that I missed.

+      &display_configurator_, display_manager_.get());
 }
 
 void ScreenManagerOzone::RequestCloseDisplay(int64_t display_id) {
   if (!fake_display_controller_)
     return;
 
   // Tell the NDD to remove the display. ScreenManager will get an update
   // that the display configuration has changed and the display will be gone.
   fake_display_controller_->RemoveDisplay(display_id);
 }
@@ skipping 156 matching lines @@
         display_manager_->GetPrimaryDisplayCandidate();
     if (primary_display.is_valid()) {
       primary_display_id_ = primary_display.id();
       DVLOG(1) << "Set primary display to " << primary_display_id_;
       screen_->display_list().UpdateDisplay(primary_display,
                                             DisplayList::Type::PRIMARY);
       delegate_->OnPrimaryDisplayChanged(primary_display_id_);
     }
   }
 
+  if (touch_transform_controller_)

[msw, 2017/01/10 19:43:27]

q: does this ever happen before init or after reset in the dtor? (is this check
necessary?)

[kylechar, 2017/01/10 22:12:18]

It shouldn't, only if someone changed the order in the destructor, so it's
probably not needed. Done.

+    touch_transform_controller_->UpdateTouchTransforms();
+
   DVLOG(1) << "PostDisplayConfigurationChange";
 }
 
 DisplayConfigurator* ScreenManagerOzone::display_configurator() {
   return &display_configurator_;
 }
 
 void ScreenManagerOzone::Create(
     const service_manager::Identity& remote_identity,
     mojom::DisplayControllerRequest request) {
   controller_bindings_.AddBinding(this, std::move(request));
 }
 
 void ScreenManagerOzone::Create(
     const service_manager::Identity& remote_identity,
     mojom::TestDisplayControllerRequest request) {
   test_bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace display