Fix ws::Display initialization order.

services/ui/ws/touch_controller.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/ws/touch_controller.h"
 
 #include <set>
 #include <vector>
 
 #include "base/logging.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/touchscreen_device.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
 
 namespace ui {
 namespace ws {
 
 namespace {
 
 // Computes the scale ratio for the TouchEvent's radius.
 double ComputeTouchResolutionScale(const Display* touch_display,
                                    const ui::TouchscreenDevice& touch_device) {
-  gfx::Size touch_display_size = touch_display->GetSize();
+  gfx::Size touch_display_size = touch_display->GetPixelSize();
 
   if (touch_device.size.IsEmpty() || touch_display_size.IsEmpty())
     return 1.0;
 
   double display_area = touch_display_size.GetArea();
   double touch_area = touch_device.size.GetArea();
   double ratio = std::sqrt(display_area / touch_area);
 
   return ratio;
 }
 
 // Computes a touch transform that maps from window bounds to touchscreen size.
 // Assumes scale factor of 1.0.
 gfx::Transform ComputeTouchTransform(
     const Display* touch_display,
     const ui::TouchscreenDevice& touch_device) {
-  gfx::Size touch_display_size = touch_display->GetSize();
+  gfx::Size touch_display_size = touch_display->GetPixelSize();
 
   gfx::SizeF current_size(touch_display_size);
   gfx::SizeF touch_area(touch_device.size);
   gfx::Transform transform;
 
   if (current_size.IsEmpty() || touch_area.IsEmpty())
     return transform;
 
   // Take care of scaling between touchscreen area and display resolution.
   transform.Scale(current_size.width() / touch_area.width(),
@@ skipping 42 matching lines @@
     }
   }
 }
 
 void TouchController::OnTouchscreenDeviceConfigurationChanged() {
   UpdateTouchTransforms();
 }
 
 }  // namespace ws
 }  // namespace ui