(Not ready for review!) Toolbar and views high dpi support.

ui/views/view.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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/base/win/dpi.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
@@ skipping 625 matching lines @@
 // static
 void View::ConvertPointToScreen(const View* src, gfx::Point* p) {
   DCHECK(src);
   DCHECK(p);
 
   // If the view is not connected to a tree, there's nothing we can do.
   const Widget* widget = src->GetWidget();
   if (widget) {
     ConvertPointToWidget(src, p);
     *p += widget->GetClientAreaBoundsInScreen().OffsetFromOrigin();
+#if defined(ENABLE_HIDPI)
+    static float dpi_scale = ui::GetDPIScale();
+    p->set_x(p->x()*dpi_scale);
+    p->set_y(p->y()*dpi_scale);
+#endif
   }
 }
 
 // static
 void View::ConvertPointFromScreen(const View* dst, gfx::Point* p) {
   DCHECK(dst);
   DCHECK(p);
 
   const views::Widget* widget = dst->GetWidget();
   if (!widget)
     return;
+#if defined(ENABLE_HIDPI)
+    static float dpi_scale = ui::GetDPIScale();
+    p->set_x(p->x()/dpi_scale);
+    p->set_y(p->y()/dpi_scale);
+#endif
   *p -= widget->GetClientAreaBoundsInScreen().OffsetFromOrigin();
   views::View::ConvertPointFromWidget(dst, p);
 }
 
 gfx::Rect View::ConvertRectToParent(const gfx::Rect& rect) const {
   gfx::RectF x_rect = rect;
   GetTransform().TransformRect(&x_rect);
   x_rect.Offset(GetMirroredPosition().OffsetFromOrigin());
   // Pixels we partially occupy in the parent should be included.
   return gfx::ToEnclosingRect(x_rect);
@@ skipping 39 matching lines @@
   // we paint our view in its mirrored position if need be.
   gfx::Rect clip_rect = bounds();
   clip_rect.Inset(clip_insets_);
   if (parent_)
     clip_rect.set_x(parent_->GetMirroredXForRect(clip_rect));
   if (!canvas->ClipRect(clip_rect))
     return;
 
   // Non-empty clip, translate the graphics such that 0,0 corresponds to
   // where this view is located (related to its parent).
+  static float scale = ui::GetDPIScale();
+  //canvas->Scale(scale,scale);
+  //canvas->Scale(1.0,1.0);
   canvas->Translate(GetMirroredPosition().OffsetFromOrigin());
   canvas->Transform(GetTransform());
 
   PaintCommon(canvas);
 }
 
 ui::ThemeProvider* View::GetThemeProvider() const {
   const Widget* widget = GetWidget();
   return widget ? widget->GetThemeProvider() : NULL;
 }
 
 const ui::NativeTheme* View::GetNativeTheme() const {
   const Widget* widget = GetWidget();
   return widget ? widget->GetNativeTheme() : ui::NativeTheme::instance();
 }
 
 // Accelerated Painting --------------------------------------------------------
 
 // static
 void View::set_use_acceleration_when_possible(bool use) {
   use_acceleration_when_possible = use;
 }
 
 // static
 bool View::get_use_acceleration_when_possible() {
   return use_acceleration_when_possible;
 }
 
 // Input -----------------------------------------------------------------------
+void ScalePoint(gfx::Point* point) {
+  static float os_scale = ui::GetDPIScale();
+  point->set_x( point->x() / os_scale);
+  point->set_y( point->y() / os_scale);
+}
 
 View* View::GetEventHandlerForPoint(const gfx::Point& point) {
   // Walk the child Views recursively looking for the View that most
   // tightly encloses the specified point.
   for (int i = child_count() - 1; i >= 0; --i) {
     View* child = child_at(i);
     if (!child->visible())
       continue;
 
     gfx::Point point_in_child_coords(point);
     ConvertPointToTarget(this, child, &point_in_child_coords);
-    if (child->HitTestPoint(point_in_child_coords))
+    gfx::Point point_in_real_coords(point_in_child_coords);
+    ScalePoint(&point_in_real_coords);
+    if (child->HitTestPoint(point_in_real_coords))
       return child->GetEventHandlerForPoint(point_in_child_coords);
   }
   return this;
 }
 
 gfx::NativeCursor View::GetCursor(const ui::MouseEvent& event) {
 #if defined(OS_WIN)
 #if defined(USE_AURA)
   static ui::Cursor arrow;
   if (!arrow.platform())
@@ skipping 1373 matching lines @@
   ConvertPointToWidget(this, &widget_location);
   GetWidget()->RunShellDrag(this, data, widget_location, drag_operations,
       source);
   return true;
 #else
   return false;
 #endif  // !defined(OS_MACOSX)
 }
 
 }  // namespace views