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

Fix compilation error after merge

Browse source
This commit is contained in:
Cheng Zhao 2016-07-21 06:03:38 -06:00
parent b57665330c
commit f6f7b41f0a
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,7 +66,7 @@
#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context.h"
#include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/WebKit/public/web/WebInputEvent.h"
#include "third_party/WebKit/public/web/WebFindOptions.h" #include "third_party/WebKit/public/web/WebFindOptions.h"
#include "ui/gfx/screen.h" #include "ui/display/screen.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
@ -1274,7 +1274,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 =
gfx::Screen::GetScreen()->GetDisplayNearestWindow(native_view) display::Screen::GetScreen()->GetDisplayNearestWindow(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);

1
atom/browser/native_window.cc
View file

@ -38,7 +38,6 @@
#include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size.h"
#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/geometry/size_conversions.h"
#include "ui/display/screen.h"
#include "ui/gl/gpu_switching_manager.h" #include "ui/gl/gpu_switching_manager.h"
DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay); DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::NativeWindowRelay);

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 38bdbe0c926b47779a45f2cf5f55105cc818a89b Subproject commit 61206fc771c936aefd2c871120b5b1dd4e1e6069