| Index: content/browser/renderer_host/render_widget_host_view_base.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
|
| index 029e72dcf3d3ceaff0cf39b0dc8ef5c635048c24..1c1972b6a2a0a9f888e857f8f246673c4d329d99 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
|
| @@ -17,7 +17,7 @@
|
| #include "content/browser/renderer_host/text_input_manager.h"
|
| #include "content/common/content_switches_internal.h"
|
| #include "media/base/video_frame.h"
|
| -#include "ui/display/display.h"
|
| +#include "ui/base/layout.h"
|
| #include "ui/display/screen.h"
|
| #include "ui/gfx/geometry/point_conversions.h"
|
| #include "ui/gfx/geometry/size_conversions.h"
|
| @@ -104,10 +104,9 @@ bool RenderWidgetHostViewBase::GetBackgroundOpaque() {
|
| }
|
|
|
| gfx::Size RenderWidgetHostViewBase::GetPhysicalBackingSize() const {
|
| - display::Display display =
|
| - display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeView());
|
| - return gfx::ScaleToCeiledSize(GetRequestedRendererSize(),
|
| - display.device_scale_factor());
|
| + return gfx::ScaleToCeiledSize(
|
| + GetRequestedRendererSize(),
|
| + ui::GetScaleFactorForNativeView(GetNativeView()));
|
| }
|
|
|
| bool RenderWidgetHostViewBase::DoBrowserControlsShrinkBlinkSize() const {
|
| @@ -277,7 +276,7 @@ void RenderWidgetHostViewBase::UpdateScreenInfo(gfx::NativeView view) {
|
|
|
| bool RenderWidgetHostViewBase::HasDisplayPropertyChanged(gfx::NativeView view) {
|
| display::Display display =
|
| - display::Screen::GetScreen()->GetDisplayNearestWindow(view);
|
| + display::Screen::GetScreen()->GetDisplayNearestView(view);
|
| if (current_display_area_ == display.work_area() &&
|
| current_device_scale_factor_ == display.device_scale_factor() &&
|
| current_display_rotation_ == display.rotation()) {
|
|
|