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

Revert "browser: dont lose coordinates in capturepage src rect"

Browse source 
This reverts commit 3c5e5053e3.
This commit is contained in:
Cheng Zhao 2016-01-04 19:37:25 +08:00
parent 9f40309487
commit 7a1717156e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/native_window.cc
View file

@ -278,22 +278,22 @@ void NativeWindow::CapturePage(const gfx::Rect& rect,
}
// Capture full page if user doesn't specify a |rect|.
const gfx::Rect view_rect = rect.IsEmpty() ? view->GetViewBounds() :
rect;
const gfx::Size view_size = rect.IsEmpty() ? view->GetViewBounds().size() :
rect.size();
// By default, the requested bitmap size is the view size in screen
// coordinates. However, if there's more pixel detail available on the
// current system, increase the requested bitmap size to capture it all.
gfx::Size bitmap_size = view_rect.size();
gfx::Size bitmap_size = view_size;
const gfx::NativeView native_view = view->GetNativeView();
gfx::Screen* const screen = gfx::Screen::GetScreenFor(native_view);
const float scale =
screen->GetDisplayNearestWindow(native_view).device_scale_factor();
if (scale > 1.0f)
bitmap_size = gfx::ScaleToCeiledSize(view_rect.size(), scale);
bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);
host->CopyFromBackingStore(
view_rect,
gfx::Rect(view_size),
bitmap_size,
base::Bind(&NativeWindow::OnCapturePageDone,
weak_factory_.GetWeakPtr(),