mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add display::GetDisplayNearestView

Browse source 
https://codereview.chromium.org/2751833004
This commit is contained in:
Aleksei Kuzmin 2017-06-17 01:09:00 +03:00
parent 6415f181ca
commit 99e57f9072
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_web_contents.cc
View file

@ -1542,7 +1542,7 @@ void WebContents::CapturePage(mate::Arguments* args) {
gfx::Size bitmap_size = view_size; gfx::Size bitmap_size = view_size;
const gfx::NativeView native_view = view->GetNativeView(); const gfx::NativeView native_view = view->GetNativeView();
const float scale = const float scale =
display::Screen::GetScreen()->GetDisplayNearestWindow(native_view) display::Screen::GetScreen()->GetDisplayNearestView(native_view)
.device_scale_factor(); .device_scale_factor();
if (scale > 1.0f) if (scale > 1.0f)
bitmap_size = gfx::ScaleToCeiledSize(view_size, scale); bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);

2
atom/browser/api/frame_subscriber.cc
View file

@ -47,7 +47,7 @@ bool FrameSubscriber::ShouldCaptureFrame(
gfx::Size bitmap_size = view_size; gfx::Size bitmap_size = view_size;
const gfx::NativeView native_view = view_->GetNativeView(); const gfx::NativeView native_view = view_->GetNativeView();
const float scale = const float scale =
display::Screen::GetScreen()->GetDisplayNearestWindow(native_view) display::Screen::GetScreen()->GetDisplayNearestView(native_view)
.device_scale_factor(); .device_scale_factor();
if (scale > 1.0f) if (scale > 1.0f)
bitmap_size = gfx::ScaleToCeiledSize(view_size, scale); bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);

2
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -219,7 +219,7 @@ InspectableWebContentsImpl::InspectableWebContentsImpl(
gfx::Rect display; gfx::Rect display;
if (web_contents->GetNativeView()) { if (web_contents->GetNativeView()) {
display = display::Screen::GetScreen()-> display = display::Screen::GetScreen()->
GetDisplayNearestWindow(web_contents->GetNativeView()).bounds(); GetDisplayNearestView(web_contents->GetNativeView()).bounds();
} else { } else {
display = display::Screen::GetScreen()->GetPrimaryDisplay().bounds(); display = display::Screen::GetScreen()->GetPrimaryDisplay().bounds();
} }