Associate internal touchscreen to internal display

ui/display/chromeos/touchscreen_delegate_impl.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/touchscreen_delegate_impl.h"
 
 #include <cmath>
 #include <set>
 
 #include "ui/display/types/chromeos/display_mode.h"
 #include "ui/display/types/chromeos/display_snapshot.h"
 #include "ui/display/types/chromeos/touchscreen_device_manager.h"
 
 namespace ui {
 
 TouchscreenDelegateImpl::TouchscreenDelegateImpl(
     scoped_ptr<TouchscreenDeviceManager> touch_device_manager)
     : touch_device_manager_(touch_device_manager.Pass()) {}
 
 TouchscreenDelegateImpl::~TouchscreenDelegateImpl() {}
 
 void TouchscreenDelegateImpl::AssociateTouchscreens(
     std::vector<DisplayConfigurator::DisplayState>* displays) {
   std::set<int> no_match_touchscreen;
   std::vector<TouchscreenDevice> devices = touch_device_manager_->GetDevices();
+
+  int internal_ts = -1;

[Daniel Erat, 2014/07/16 02:59:46]

s/ts/touchscreen/

[Yufeng Shen (Slow to review), 2014/07/16 20:20:27]

Done.

   for (size_t i = 0; i < devices.size(); ++i) {
+    if (devices[i].is_internal) {
+      internal_ts = i;
+      break;
+    }
+  }
+
+  DisplayConfigurator::DisplayState* internal_dpy_state = NULL;

[Daniel Erat, 2014/07/16 02:59:46]

s/dpy/display/, or just name this |internal_state|

[Yufeng Shen (Slow to review), 2014/07/16 20:20:27]

Done.

+  for (size_t i = 0; i < displays->size(); ++i) {
+    DisplayConfigurator::DisplayState* state = &(*displays)[i];
+    if (state->display->type() == DISPLAY_CONNECTION_TYPE_INTERNAL &&
+        state->display->native_mode() &&
+        state->touch_device_id == 0) {
+      internal_dpy_state = state;
+      break;
+    }
+  }
+
+  if (internal_dpy_state && internal_ts >= 0) {
+    internal_dpy_state->touch_device_id = devices[internal_ts].id;
+    VLOG(2) << "Found internal touchscreen for internal display "
+            << internal_dpy_state->display->display_id() << " touch_device_id "
+            << internal_dpy_state->touch_device_id << " size "
+            << devices[internal_ts].size.ToString();
+  }
+
+  for (size_t i = 0; i < devices.size(); ++i) {
+    if (internal_dpy_state &&
+        internal_dpy_state->touch_device_id == devices[i].id)
+      continue;
     bool found_mapping = false;
     for (size_t j = 0; j < displays->size(); ++j) {
       DisplayConfigurator::DisplayState* state = &(*displays)[j];
       const DisplayMode* mode = state->display->native_mode();
       if (state->touch_device_id != 0 || !mode)
         continue;
 
       // Allow 1 pixel difference between screen and touchscreen
       // resolutions. Because in some cases for monitor resolution
       // 1024x768 touchscreen's resolution would be 1024x768, but for
@@ skipping 35 matching lines @@
         VLOG(2) << "Arbitrarily matching touchscreen "
                 << state->touch_device_id << " to display "
                 << state->display->display_id();
         break;
       }
     }
   }
 }
 
 }  // namespace ui