Refactor Windows DPI Point, Rect, and Size for Multiple Monitor DPI Awareness

ui/gfx/screen.cc

 // Copyright 2012 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/gfx/screen.h"
+
 #include "base/logging.h"
-#include "ui/gfx/screen.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/screen_type_delegate.h"
 
 namespace gfx {
 
 namespace {
 
 Screen* g_screen_[SCREEN_TYPE_LAST + 1];
 ScreenTypeDelegate* g_screen_type_delegate_ = NULL;
 
 }  // namespace
@@ skipping 31 matching lines @@
   g_screen_type_delegate_ = delegate;
 }
 
 // static
 Screen* Screen::GetNativeScreen() {
   if (!g_screen_[SCREEN_TYPE_NATIVE])
     g_screen_[SCREEN_TYPE_NATIVE] = CreateNativeScreen();
   return g_screen_[SCREEN_TYPE_NATIVE];
 }
 
+gfx::Rect Screen::ScreenToDIPRectInWindow(NativeView view,
+                                          const gfx::Rect& screen_rect) const {
+  float scale = GetDisplayNearestWindow(view).device_scale_factor();
+  return gfx::Rect(gfx::ScaleToFlooredPoint(screen_rect.origin(), 1.0f / scale),
+                   gfx::ScaleToCeiledSize(screen_rect.size(), 1.0f / scale));
+}
+
+gfx::Rect Screen::DIPToScreenRectInWindow(NativeView view,
+                                          const gfx::Rect& dip_rect) const {
+  float scale = GetDisplayNearestWindow(view).device_scale_factor();
+  return gfx::Rect(gfx::ScaleToFlooredPoint(dip_rect.origin(), scale),
+                   gfx::ScaleToCeiledSize(dip_rect.size(), scale));
+}
+
 }  // namespace gfx