ozone: Use gfx::Display size for touch scaling

ui/events/ozone/evdev/touch_event_converter_evdev.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/events/ozone/evdev/touch_event_converter_evdev.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <poll.h>
 #include <stdio.h>
 #include <unistd.h>
 
 #include <cmath>
 #include <limits>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop/message_pump_ozone.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/ozone/event_factory_ozone.h"
-#include "ui/gfx/ozone/surface_factory_ozone.h"
+#include "ui/gfx/screen.h"
 
 namespace {
 
 // Number is determined empirically.
 // TODO(rjkroege): Configure this per device.
 const float kFingerWidth = 25.f;
 
 }  // namespace
 
 namespace ui {
@@ skipping 14 matching lines @@
       path_(path) {
   Init();
 }
 
 TouchEventConverterEvdev::~TouchEventConverterEvdev() {
   Stop();
   close(fd_);
 }
 
 void TouchEventConverterEvdev::Init() {
-  if (x_max_ && y_max_ && gfx::SurfaceFactoryOzone::GetInstance()) {
-    const char* display =
-        gfx::SurfaceFactoryOzone::GetInstance()->DefaultDisplaySpec();
-    int screen_width, screen_height;
-    int sc = sscanf(display, "%dx%d", &screen_width, &screen_height);
-    if (sc == 2) {
-      x_scale_ = (double)screen_width / (x_max_ - x_min_);
-      y_scale_ = (double)screen_height / (y_max_ - y_min_);
-      x_max_ = screen_width - 1;
-      y_max_ = screen_height - 1;
-      VLOG(1) << "touch input x_scale=" << x_scale_
-              << " y_scale=" << y_scale_;
-    } else {
-      LOG(WARNING) << "malformed display spec from "
-                   << "SurfaceFactoryOzone::DefaultDisplaySpec";
-    }
-  }
+  gfx::Screen *screen = gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE);
+  if (!screen)
+    return;  // No scaling.
+  gfx::Display display = screen->GetPrimaryDisplay();
+  gfx::Size size = display.GetSizeInPixel();
+
+  x_scale_ = (double)size.width() / (x_max_ - x_min_);
+  y_scale_ = (double)size.height() / (y_max_ - y_min_);
+  VLOG(1) << "touch scaling x_scale=" << x_scale_ << " y_scale=" << y_scale_;
 }
 
 void TouchEventConverterEvdev::Start() {
   base::MessagePumpOzone::Current()->WatchFileDescriptor(
       fd_, true, base::MessagePumpLibevent::WATCH_READ, &controller_, this);
 }
 
 void TouchEventConverterEvdev::Stop() {
   controller_.StopWatchingFileDescriptor();
 }
@@ skipping 95 matching lines @@
         default:
           NOTREACHED() << "invalid code for EV_KEY: " << input.code;
       }
     } else {
       NOTREACHED() << "invalid type: " << input.type;
     }
   }
 }
 
 }  // namespace ui