| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/dip_util.h" | 5 #include "content/browser/renderer_host/dip_util.h" |
| 6 | 6 |
| 7 #include "content/public/browser/render_widget_host_view.h" | 7 #include "content/public/browser/render_widget_host_view.h" |
| 8 #include "ui/base/layout.h" | 8 #include "ui/base/layout.h" |
| 9 #include "ui/gfx/display.h" | |
| 10 #include "ui/gfx/geometry/dip_util.h" | 9 #include "ui/gfx/geometry/dip_util.h" |
| 11 #include "ui/gfx/geometry/point.h" | 10 #include "ui/gfx/geometry/point.h" |
| 12 #include "ui/gfx/geometry/point_conversions.h" | 11 #include "ui/gfx/geometry/point_conversions.h" |
| 13 #include "ui/gfx/geometry/rect.h" | 12 #include "ui/gfx/geometry/rect.h" |
| 14 #include "ui/gfx/geometry/rect_conversions.h" | 13 #include "ui/gfx/geometry/rect_conversions.h" |
| 15 #include "ui/gfx/geometry/size.h" | 14 #include "ui/gfx/geometry/size.h" |
| 16 #include "ui/gfx/geometry/size_conversions.h" | 15 #include "ui/gfx/geometry/size_conversions.h" |
| 17 #include "ui/gfx/screen.h" | |
| 18 | 16 |
| 19 namespace content { | 17 namespace content { |
| 20 | 18 |
| 21 float GetScaleFactorForView(const RenderWidgetHostView* view) { | 19 float GetScaleFactorForView(const RenderWidgetHostView* view) { |
| 22 return ui::GetScaleFactorForNativeView(view ? view->GetNativeView() : NULL); | 20 return ui::GetScaleFactorForNativeView(view ? view->GetNativeView() : NULL); |
| 23 } | 21 } |
| 24 | 22 |
| 25 gfx::Point ConvertViewPointToDIP(const RenderWidgetHostView* view, | 23 gfx::Point ConvertViewPointToDIP(const RenderWidgetHostView* view, |
| 26 const gfx::Point& point_in_pixel) { | 24 const gfx::Point& point_in_pixel) { |
| 27 return gfx::ConvertPointToDIP(GetScaleFactorForView(view), point_in_pixel); | 25 return gfx::ConvertPointToDIP(GetScaleFactorForView(view), point_in_pixel); |
| 28 } | 26 } |
| 29 | 27 |
| 30 gfx::Size ConvertViewSizeToPixel(const RenderWidgetHostView* view, | 28 gfx::Size ConvertViewSizeToPixel(const RenderWidgetHostView* view, |
| 31 const gfx::Size& size_in_dip) { | 29 const gfx::Size& size_in_dip) { |
| 32 return gfx::ConvertSizeToPixel(GetScaleFactorForView(view), size_in_dip); | 30 return gfx::ConvertSizeToPixel(GetScaleFactorForView(view), size_in_dip); |
| 33 } | 31 } |
| 34 | 32 |
| 35 gfx::Rect ConvertViewRectToPixel(const RenderWidgetHostView* view, | 33 gfx::Rect ConvertViewRectToPixel(const RenderWidgetHostView* view, |
| 36 const gfx::Rect& rect_in_dip) { | 34 const gfx::Rect& rect_in_dip) { |
| 37 return gfx::ConvertRectToPixel(GetScaleFactorForView(view), rect_in_dip); | 35 return gfx::ConvertRectToPixel(GetScaleFactorForView(view), rect_in_dip); |
| 38 } | 36 } |
| 39 | 37 |
| 40 } // namespace content | 38 } // namespace content |
| OLD | NEW |