From 99e57f9072b40eaa58876b3b62898c6932ddc820 Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Sat, 17 Jun 2017 01:09:00 +0300 Subject: [PATCH] Add display::GetDisplayNearestView https://codereview.chromium.org/2751833004 --- atom/browser/api/atom_api_web_contents.cc | 2 +- atom/browser/api/frame_subscriber.cc | 2 +- brightray/browser/inspectable_web_contents_impl.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index ecf7f80ee0..27925c52e7 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -1542,7 +1542,7 @@ void WebContents::CapturePage(mate::Arguments* args) { gfx::Size bitmap_size = view_size; const gfx::NativeView native_view = view->GetNativeView(); const float scale = - display::Screen::GetScreen()->GetDisplayNearestWindow(native_view) + display::Screen::GetScreen()->GetDisplayNearestView(native_view) .device_scale_factor(); if (scale > 1.0f) bitmap_size = gfx::ScaleToCeiledSize(view_size, scale); diff --git a/atom/browser/api/frame_subscriber.cc b/atom/browser/api/frame_subscriber.cc index 076ebde982..87f9ef1428 100644 --- a/atom/browser/api/frame_subscriber.cc +++ b/atom/browser/api/frame_subscriber.cc @@ -47,7 +47,7 @@ bool FrameSubscriber::ShouldCaptureFrame( gfx::Size bitmap_size = view_size; const gfx::NativeView native_view = view_->GetNativeView(); const float scale = - display::Screen::GetScreen()->GetDisplayNearestWindow(native_view) + display::Screen::GetScreen()->GetDisplayNearestView(native_view) .device_scale_factor(); if (scale > 1.0f) bitmap_size = gfx::ScaleToCeiledSize(view_size, scale); diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc index 3569326f39..23aefd3450 100644 --- a/brightray/browser/inspectable_web_contents_impl.cc +++ b/brightray/browser/inspectable_web_contents_impl.cc @@ -219,7 +219,7 @@ InspectableWebContentsImpl::InspectableWebContentsImpl( gfx::Rect display; if (web_contents->GetNativeView()) { display = display::Screen::GetScreen()-> - GetDisplayNearestWindow(web_contents->GetNativeView()).bounds(); + GetDisplayNearestView(web_contents->GetNativeView()).bounds(); } else { display = display::Screen::GetScreen()->GetPrimaryDisplay().bounds(); }