Account for device scale factor in AppWindow.setShape(), under Windows.

ui/views/widget/desktop_aura/desktop_window_tree_host_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 "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
 
 #include "base/win/metro.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 262 matching lines @@
   monitor_info.cbSize = sizeof(monitor_info);
   GetMonitorInfo(MonitorFromWindow(message_handler_->hwnd(),
                                    MONITOR_DEFAULTTONEAREST),
                  &monitor_info);
   gfx::Rect pixel_bounds = gfx::Rect(monitor_info.rcWork);
   return gfx::win::ScreenToDIPRect(pixel_bounds);
 }
 
 void DesktopWindowTreeHostWin::SetShape(gfx::NativeRegion native_region) {
   if (native_region) {
-    message_handler_->SetRegion(gfx::CreateHRGNFromSkRegion(*native_region));
+

[sky, 2014/09/04 13:23:05]

nit: no newline here.

[Wez, 2014/09/04 17:50:50]

Done.

+    // TODO(wez): This would be a lot simpler if we were passed an SkPath.
+    // See crbug.com/410593.
+    gfx::NativeRegion shape = native_region;
+    SkRegion device_region;
+    if (gfx::IsInHighDPIMode()) {
+      shape = &device_region;
+      const float& scale = gfx::win::GetDeviceScaleFactor();

[sky, 2014/09/04 13:23:05]

I think you want GetDPIScale() and no &, just const float scale. If you don't
think you want GetDPI, how come you want the scale factor?

[sky, 2014/09/04 17:40:09]

Actually, both are the same, so it shouldn't matter.

[Wez, 2014/09/04 17:50:50]

Re GetDPIScale: Done.

Re const float&: We want to use const& when complex types are returned, IIUC, to
help the compiler optimize out a potential copy, so it seems preferable to use
it consistently for both complex and POD types - that OK?

+      std::vector<SkIRect> rects;
+      for (SkRegion::Iterator it(*native_region); !it.done(); it.next()) {
+        const SkIRect& rect = it.rect();
+        SkRect scaled_rect =
+            SkRect::MakeLTRB(rect.left() * scale, rect.top() * scale,
+                             rect.right() * scale, rect.bottom() * scale);
+        SkIRect rounded_scaled_rect;
+        scaled_rect.roundOut(&rounded_scaled_rect);
+        rects.push_back(rounded_scaled_rect);
+      }
+      if (!rects.empty()) {

[sky, 2014/09/04 13:23:05]

nit: no {}

[Wez, 2014/09/04 17:50:50]

Done.

+        device_region.setRects(&rects[0], rects.size());
+      }
+    }
+
+    message_handler_->SetRegion(gfx::CreateHRGNFromSkRegion(*shape));
   } else {
     message_handler_->SetRegion(NULL);
   }
 
   delete native_region;
 }
 
 void DesktopWindowTreeHostWin::Activate() {
   message_handler_->Activate();
 }
@@ skipping 645 matching lines @@
 
 // static
 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura) {
   return new DesktopWindowTreeHostWin(native_widget_delegate,
                                       desktop_native_widget_aura);
 }
 
 }  // namespace views