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

content/browser/renderer_host/render_widget_host_view_base.cc

 // Copyright (c) 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 "content/browser/renderer_host/render_widget_host_view_base.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
@@ skipping 12 matching lines @@
 #include "base/message_loop/message_loop.h"
 #include "base/win/wrapped_window_proc.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/common/plugin_constants_win.h"
 #include "content/common/webplugin_geometry.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/common/content_switches.h"
 #include "ui/gfx/gdi_util.h"
-#include "ui/gfx/win/dpi.h"
+#include "ui/gfx/screen_win.h"
 #include "ui/gfx/win/hwnd_util.h"
 #endif
 
 namespace content {
 
 #if defined(OS_WIN)
 
 namespace {
 
 // |window| is the plugin HWND, created and destroyed in the plugin process.
@@ skipping 99 matching lines @@
       base::Bind(&NotifyPluginProcessHostHelper, window, new_parent,
                  kMaxTries));
   return new_parent;
 }
 
 BOOL CALLBACK PaintEnumChildProc(HWND hwnd, LPARAM lparam) {
   if (!PluginServiceImpl::GetInstance()->IsPluginWindow(hwnd))
     return TRUE;
 
   gfx::Rect* rect = reinterpret_cast<gfx::Rect*>(lparam);
-  gfx::Rect rect_in_pixels = gfx::win::DIPToScreenRect(*rect);
+  gfx::Rect rect_in_pixels = gfx::ScreenWin::DIPToScreenRect(hwnd, *rect);
   static UINT msg = RegisterWindowMessage(kPaintMessageName);
   WPARAM wparam = MAKEWPARAM(rect_in_pixels.x(), rect_in_pixels.y());
   lparam = MAKELPARAM(rect_in_pixels.width(), rect_in_pixels.height());
 
   // SendMessage gets the message across much quicker than PostMessage, since it
   // doesn't get queued.  When the plugin thread calls PeekMessage or other
   // Win32 APIs, sent messages are dispatched automatically.
   SendNotifyMessage(hwnd, msg, wparam, lparam);
 
   return TRUE;
@@ skipping 93 matching lines @@
       // if Windows tries to paint it synchronously inside EndDeferWindowsPos
       // then it won't have the data and it will flash white. So instead we
       // manually redraw the plugin.
       // Why not do this for native Windows? Not sure if there are any
       // performance issues with this.
       flags |= SWP_NOREDRAW;
     }
 #endif
 
     if (move.rects_valid) {
-      gfx::Rect clip_rect_in_pixel = gfx::win::DIPToScreenRect(move.clip_rect);
+      gfx::Rect clip_rect_in_pixel =
+          gfx::ScreenWin::DIPToScreenRect(window, move.clip_rect);
       HRGN hrgn = ::CreateRectRgn(clip_rect_in_pixel.x(),
                                   clip_rect_in_pixel.y(),
                                   clip_rect_in_pixel.right(),
                                   clip_rect_in_pixel.bottom());
       gfx::SubtractRectanglesFromRegion(hrgn, move.cutout_rects);
 
       // Note: System will own the hrgn after we call SetWindowRgn,
       // so we don't need to call DeleteObject(hrgn)
       ::SetWindowRgn(window, hrgn,
                      !move.clip_rect.IsEmpty() && (flags & SWP_NOREDRAW) == 0);
 
 #if defined(USE_AURA)
       // When using the software compositor, if the clipping rectangle is empty
       // then DeferWindowPos won't redraw the newly uncovered area under the
       // plugin.
       if (clip_rect_in_pixel.IsEmpty() &&
           !GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor()) {
         RECT r;
         GetClientRect(window, &r);
         MapWindowPoints(window, parent, reinterpret_cast<POINT*>(&r), 2);
         invalidate_rects.push_back(r);
       }
 #endif
     } else {
       flags |= SWP_NOMOVE;
       flags |= SWP_NOSIZE;
     }
 
     gfx::Rect window_rect_in_pixel =
-        gfx::win::DIPToScreenRect(move.window_rect);
+        gfx::ScreenWin::DIPToScreenRect(window, move.window_rect);
     defer_window_pos_info = ::DeferWindowPos(defer_window_pos_info,
                                              window, NULL,
                                              window_rect_in_pixel.x(),
                                              window_rect_in_pixel.y(),
                                              window_rect_in_pixel.width(),
                                              window_rect_in_pixel.height(),
                                              flags);
 
     if (!defer_window_pos_info) {
       DCHECK(false) << "DeferWindowPos failed, so all plugin moves ignored.";
@@ skipping 381 matching lines @@
 }
 
 void RenderWidgetHostViewBase::TransformPointToLocalCoordSpace(
     const gfx::Point& point,
     cc::SurfaceId original_surface,
     gfx::Point* transformed_point) {
   *transformed_point = point;
 }
 
 }  // namespace content