Fix high-DPI on Windows to make use of DIP scaling in WebKit.

content/browser/renderer_host/render_widget_host_view_win.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_win.h"
 
 #include <algorithm>
 #include <map>
 #include <stack>
 
@@ skipping 32 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/process_type.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFactory.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/view_prop.h"
+#include "ui/base/win/dpi.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 #include "win8/util/win8_util.h"
@@ skipping 219 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(TouchEventFromWebTouchPoint);
 };
 
 bool ShouldSendPinchGesture() {
   static bool pinch_allowed =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePinch);
   return pinch_allowed;
 }
 
+void GetScreenInfoForWindow(WebKit::WebScreenInfo* results, HWND window) {
+

[pkotwicz, 2013/01/23 19:39:23]

Pass in NativeViewId here instead of HWND

Nit: Get rid of the extra line.

[kevers, 2013/01/23 21:37:00]

Done.

+  *results = WebKit::WebScreenInfoFactory::screenInfo(window);
+#if defined(ENABLE_HIDPI)
+  results->deviceScaleFactor = gfx::Display::GetForcedDeviceScaleFactor();
+#else
+  results->deviceScaleFactor = 1;
+#endif
+}
+
 }  // namespace
 
 const wchar_t kRenderWidgetHostHWNDClass[] = L"Chrome_RenderWidgetHostHWND";
 
 // Wrapper for maintaining touchstate associated with a WebTouchEvent.
 class WebTouchState {
  public:
   explicit WebTouchState(const RenderWidgetHostViewWin* window);
 
   // Updates the current touchpoint state with the supplied touches.
@@ skipping 144 matching lines @@
     render_widget_host_->WasHidden();
 
   if (accelerated_surface_.get())
     accelerated_surface_->WasHidden();
 
   if (GetBrowserAccessibilityManager())
     GetBrowserAccessibilityManager()->WasHidden();
 }
 
 void RenderWidgetHostViewWin::SetSize(const gfx::Size& size) {
-  SetBounds(gfx::Rect(GetViewBounds().origin(), size));
+  SetBounds(gfx::Rect(GetPixelBounds().origin(), size));
 }
 
 void RenderWidgetHostViewWin::SetBounds(const gfx::Rect& rect) {
   if (is_hidden_)
     return;
 
   // No SWP_NOREDRAW as autofill popups can move and the underneath window
   // should redraw in that case.
   UINT swp_flags = SWP_NOSENDCHANGING | SWP_NOOWNERZORDER | SWP_NOCOPYBITS |
       SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE;
@@ skipping 112 matching lines @@
   ShowWindow(SW_HIDE);
 
   WasHidden();
 }
 
 bool RenderWidgetHostViewWin::IsShowing() {
   return !!IsWindowVisible();
 }
 
 gfx::Rect RenderWidgetHostViewWin::GetViewBounds() const {
+  return ui::win::ScreenToDIPRect(GetPixelBounds());
+}
+
+gfx::Rect RenderWidgetHostViewWin::GetPixelBounds() const {
   CRect window_rect;
   GetWindowRect(&window_rect);
   return gfx::Rect(window_rect);
 }
 
 void RenderWidgetHostViewWin::UpdateCursor(const WebCursor& cursor) {
   current_cursor_ = cursor;
   UpdateCursorIfOverSelf();
 }
 
@@ skipping 77 matching lines @@
   //
   // We paint this window synchronously, however child windows (i.e. plugins)
   // are painted asynchronously.  By avoiding synchronous cross-process window
   // message dispatching we allow scrolling to be smooth, and also avoid the
   // browser process locking up if the plugin process is hung.
   //
   RedrawWindow(NULL, damage_region, RDW_UPDATENOW | RDW_NOCHILDREN);
 
   // Send the invalid rect in screen coordinates.
   gfx::Rect invalid_screen_rect(damage_bounds);
-  invalid_screen_rect.Offset(GetViewBounds().OffsetFromOrigin());
+  invalid_screen_rect.Offset(GetPixelBounds().OffsetFromOrigin());
 
   PaintPluginWindowsHelper(m_hWnd, invalid_screen_rect);
 }
 
 void RenderWidgetHostViewWin::DidUpdateBackingStore(
     const gfx::Rect& scroll_rect,
     const gfx::Vector2d& scroll_delta,
     const std::vector<gfx::Rect>& copy_rects) {
   if (is_hidden_)
     return;
@@ skipping 100 matching lines @@
     return;
 
   scoped_callback_runner.Release();
   accelerated_surface_->AsyncCopyTo(
       src_subrect,
       dst_size,
       output->GetBitmap().getPixels(),
       callback);
 }
 
+void RenderWidgetHostViewWin::GetScreenInfo(WebKit::WebScreenInfo* results) {
+  GetScreenInfoForWindow(results, 0);

[pkotwicz, 2013/01/23 19:39:23]

This should be GetNativeViewId() instead of 0.

[kevers, 2013/01/23 21:37:00]

Done.

+}
+
+// static
+void RenderWidgetHostViewPort::GetDefaultScreenInfo(
+      WebKit::WebScreenInfo* results) {
+  GetScreenInfoForWindow(results, NULL);

[pkotwicz, 2013/01/23 19:39:23]

This should probably be 0 instead of NULL.

[kevers, 2013/01/23 21:37:00]

Done.

+}
+
 void RenderWidgetHostViewWin::SetBackground(const SkBitmap& background) {
   RenderWidgetHostViewBase::SetBackground(background);
   render_widget_host_->SetBackground(background);
 }
 
 void RenderWidgetHostViewWin::ProcessAckedTouchEvent(
     const WebKit::WebTouchEvent& touch, InputEventAckState ack_result) {
   DCHECK(touch_events_enabled_);
 
   ScopedVector<ui::TouchEvent> events;
@@ skipping 1536 matching lines @@
   gfx::Rect rect(window_rect);
 
   // Maximized windows are outdented from the work area by the frame thickness
   // even though this "frame" is not painted.  This confuses code (and people)
   // that think of a maximized window as corresponding exactly to the work area.
   // Correct for this by subtracting the frame thickness back off.
   if (::IsZoomed(root_window)) {
     rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME),
                GetSystemMetrics(SM_CYSIZEFRAME));
   }
-  return rect;
+
+  // Convert to DIP
+  return ui::win::ScreenToDIPRect(rect);
 }
 
 // Creates a HWND within the RenderWidgetHostView that will serve as a host
 // for a HWND that the GPU process will create. The host window is used
 // to Z-position the GPU's window relative to other plugin windows.
 gfx::GLSurfaceHandle RenderWidgetHostViewWin::GetCompositingSurface() {
   // If the window has been created, don't recreate it a second time
   if (compositor_host_window_)
     return gfx::GLSurfaceHandle(compositor_host_window_, true);
 
@@ skipping 324 matching lines @@
 void RenderWidgetHostViewWin::ForwardMouseEventToRenderer(UINT message,
                                                           WPARAM wparam,
                                                           LPARAM lparam) {
   TRACE_EVENT0("browser",
                "RenderWidgetHostViewWin::ForwardMouseEventToRenderer");
   if (!render_widget_host_) {
     TRACE_EVENT0("browser", "EarlyOut_NoRWH");
     return;
   }
 
+#if defined(ENABLE_HIDPI)
+  // Convert to DIP
+  gfx::Point point = ui::win::ScreenToDIPPoint(
+      gfx::Point(static_cast<short>(LOWORD(lparam)),
+                 static_cast<short>(HIWORD(lparam))));
+  lparam = (point.y() << 16) + point.x();
+#endif
+
   WebMouseEvent event(
       WebInputEventFactory::mouseEvent(m_hWnd, message, wparam, lparam));
 
   if (mouse_locked_) {
     event.movementX = event.globalX - last_mouse_position_.locked_global.x();
     event.movementY = event.globalY - last_mouse_position_.locked_global.y();
     last_mouse_position_.locked_global.SetPoint(event.globalX, event.globalY);
 
     event.x = last_mouse_position_.unlocked.x();
     event.y = last_mouse_position_.unlocked.y();
@@ skipping 232 matching lines @@
     // When there is no on-going composition but |position->dwCharPos| is 0,
     // use the caret rect. This behavior is the same to RichEdit. In fact,
     // CUAS (Cicero Unaware Application Support) relies on this behavior to
     // implement ITfContextView::GetTextExt on top of IMM32-based applications.
     target_rect = caret_rect_.ToRECT();
   } else {
     return 0;
   }
   ClientToScreen(&target_rect);
 
-  RECT document_rect = GetViewBounds().ToRECT();
+  RECT document_rect = GetPixelBounds().ToRECT();
   ClientToScreen(&document_rect);
 
   position->pt.x = target_rect.left;
   position->pt.y = target_rect.top;
   position->cLineHeight = target_rect.bottom - target_rect.top;
   position->rcDocument = document_rect;
   return 1;
 }
 
 void RenderWidgetHostViewWin::UpdateIMEState() {
@@ skipping 13 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewWin(widget);
 }
 
 }  // namespace content