From f5f57536d07439d29a36610e33780e75c9102246 Mon Sep 17 00:00:00 2001
From: Andrew Wilson <apwilson@google.com>
Date: Mon, 18 Jun 2018 09:47:37 -0700
Subject: [PATCH] Revert "Make window metrics doubles to reduce rounding
 issues."

This reverts commit 15b76dd33c9844cb8a8de169f945ec1663c6f3ea.
---
 lib/ui/window/viewport_metrics.h | 22 +++++++++++-----------
 lib/ui/window/window.cc          | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/ui/window/viewport_metrics.h b/lib/ui/window/viewport_metrics.h
index 0ccb50ccc43..5085d06f427 100644
--- a/lib/ui/window/viewport_metrics.h
+++ b/lib/ui/window/viewport_metrics.h
@@ -10,17 +10,17 @@
 namespace blink {
 
 struct ViewportMetrics {
-  double device_pixel_ratio = 1.0;
-  double physical_width = 0;
-  double physical_height = 0;
-  double physical_padding_top = 0;
-  double physical_padding_right = 0;
-  double physical_padding_bottom = 0;
-  double physical_padding_left = 0;
-  double physical_view_inset_top = 0;
-  double physical_view_inset_right = 0;
-  double physical_view_inset_bottom = 0;
-  double physical_view_inset_left = 0;
+  float device_pixel_ratio = 1.0;
+  int32_t physical_width = 0;
+  int32_t physical_height = 0;
+  int32_t physical_padding_top = 0;
+  int32_t physical_padding_right = 0;
+  int32_t physical_padding_bottom = 0;
+  int32_t physical_padding_left = 0;
+  int32_t physical_view_inset_top = 0;
+  int32_t physical_view_inset_right = 0;
+  int32_t physical_view_inset_bottom = 0;
+  int32_t physical_view_inset_left = 0;
 };
 
 struct LogicalSize {
diff --git a/lib/ui/window/window.cc b/lib/ui/window/window.cc
index 0fe9a12efaa..2d5d7a1569b 100644
--- a/lib/ui/window/window.cc
+++ b/lib/ui/window/window.cc
@@ -149,16 +149,16 @@ void Window::UpdateWindowMetrics(const ViewportMetrics& metrics) {
       library_.value(), "_updateWindowMetrics",
       {
           ToDart(metrics.device_pixel_ratio),
-          ToDart(metrics.physical_width),
-          ToDart(metrics.physical_height),
-          ToDart(metrics.physical_padding_top),
-          ToDart(metrics.physical_padding_right),
-          ToDart(metrics.physical_padding_bottom),
-          ToDart(metrics.physical_padding_left),
-          ToDart(metrics.physical_view_inset_top),
-          ToDart(metrics.physical_view_inset_right),
-          ToDart(metrics.physical_view_inset_bottom),
-          ToDart(metrics.physical_view_inset_left),
+          ToDart(static_cast<double>(metrics.physical_width)),
+          ToDart(static_cast<double>(metrics.physical_height)),
+          ToDart(static_cast<double>(metrics.physical_padding_top)),
+          ToDart(static_cast<double>(metrics.physical_padding_right)),
+          ToDart(static_cast<double>(metrics.physical_padding_bottom)),
+          ToDart(static_cast<double>(metrics.physical_padding_left)),
+          ToDart(static_cast<double>(metrics.physical_view_inset_top)),
+          ToDart(static_cast<double>(metrics.physical_view_inset_right)),
+          ToDart(static_cast<double>(metrics.physical_view_inset_bottom)),
+          ToDart(static_cast<double>(metrics.physical_view_inset_left)),
       });
 }