Refactoring display configuration state to allow generic state objects

chromeos/display/touchscreen_delegate_x11.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 "chromeos/display/touchscreen_delegate_x11.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 
 #include <cmath>
 #include <set>
 
 #include "base/message_loop/message_pump_x11.h"
+#include "ui/display/chromeos/display_mode.h"
+#include "ui/display/chromeos/display_snapshot.h"
 
 namespace chromeos {
 
 TouchscreenDelegateX11::TouchscreenDelegateX11()
     : display_(base::MessagePumpX11::GetDefaultXDisplay()) {}
 
 TouchscreenDelegateX11::~TouchscreenDelegateX11() {}
 
 void TouchscreenDelegateX11::AssociateTouchscreens(
-    std::vector<OutputConfigurator::OutputSnapshot>* outputs) {
+    std::vector<OutputConfigurator::InternalDisplayState>* outputs) {
   int ndevices = 0;
   Atom valuator_x = XInternAtom(display_, "Abs MT Position X", False);
   Atom valuator_y = XInternAtom(display_, "Abs MT Position Y", False);
   if (valuator_x == None || valuator_y == None)
     return;
 
   std::set<int> no_match_touchscreen;
   XIDeviceInfo* info = XIQueryDevice(display_, XIAllDevices, &ndevices);
   for (int i = 0; i < ndevices; i++) {
     if (!info[i].enabled || info[i].use != XIFloatingSlave)
@@ skipping 31 matching lines @@
         is_direct_touch = touch_info->mode == XIDirectTouch;
       }
 #endif
     }
 
     // Touchscreens should have absolute X and Y axes,
     // and be direct touch devices.
     if (width > 0.0 && height > 0.0 && is_direct_touch) {
       size_t k = 0;
       for (; k < outputs->size(); k++) {
-        OutputConfigurator::OutputSnapshot* output = &(*outputs)[k];
-        if (output->native_mode == None || output->touch_device_id != None)
+        OutputConfigurator::InternalDisplayState* output = &(*outputs)[k];
+        if (output->touch_device_id != None)
           continue;
 
-        const OutputConfigurator::ModeInfo* mode_info =
-            OutputConfigurator::GetModeInfo(*output, output->native_mode);
+        const ui::DisplayMode* mode_info = output->display->native_mode();
         if (!mode_info)
           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
         // some 1023x767.  It really depends on touchscreen's firmware
         // configuration.
-        if (std::abs(mode_info->width - width) <= 1.0 &&
-            std::abs(mode_info->height - height) <= 1.0) {
+        if (std::abs(mode_info->size().width() - width) <= 1.0 &&
+            std::abs(mode_info->size().height() - height) <= 1.0) {
           output->touch_device_id = info[i].deviceid;
 
           VLOG(2) << "Found touchscreen for output #" << k
                   << " id " << output->touch_device_id
                   << " width " << width
                   << " height " << height;
           break;
         }
       }
 
       if (k == outputs->size()) {
         no_match_touchscreen.insert(info[i].deviceid);
         VLOG(2) << "No matching output for touchscreen"
                 << " id " << info[i].deviceid
                 << " width " << width
                 << " height " << height;
       }
 
     }
   }
 
   // Sometimes we can't find a matching screen for the touchscreen, e.g.
   // due to the touchscreen's reporting range having no correlation with the
   // screen's resolution. In this case, we arbitrarily assign unmatched
   // touchscreens to unmatched screens.
   for (std::set<int>::iterator it = no_match_touchscreen.begin();
        it != no_match_touchscreen.end();
        it++) {
     for (size_t i = 0; i < outputs->size(); i++) {
-      if ((*outputs)[i].type != ui::OUTPUT_TYPE_INTERNAL &&
-          (*outputs)[i].native_mode != None &&
+      if ((*outputs)[i].display->type() != ui::OUTPUT_TYPE_INTERNAL &&
+          (*outputs)[i].display->native_mode() != NULL &&
           (*outputs)[i].touch_device_id == None) {
         (*outputs)[i].touch_device_id = *it;
         VLOG(2) << "Arbitrarily matching touchscreen "
                 << (*outputs)[i].touch_device_id << " to output #" << i;
         break;
       }
     }
   }
 
   XIFreeDeviceInfo(info);
@@ skipping 33 matching lines @@
                        format,
                        PropModeReplace,
                        reinterpret_cast<unsigned char*>(value),
                        9);
     }
   }
   XIFreeDeviceInfo(info);
 }
 
 }  // namespace chromeos