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

pull up definition and remove include

Browse source
This commit is contained in:
Shelley Vohr 2018-04-14 21:23:05 -04:00
parent 8b4a89c445
commit 1727a9eca9
No known key found for this signature in database
GPG key ID: F13993A75599653C
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -104,6 +104,8 @@ void AutoUpdater::SetFeedURL(mate::Arguments* args) {
} }
void AutoUpdater::QuitAndInstall() { void AutoUpdater::QuitAndInstall() {
Emit("before-quit-for-update");
// If we don't have any window then quitAndInstall immediately. // If we don't have any window then quitAndInstall immediately.
if (WindowList::IsEmpty()) { if (WindowList::IsEmpty()) {
auto_updater::AutoUpdater::QuitAndInstall(); auto_updater::AutoUpdater::QuitAndInstall();

7
atom/common/api/atom_api_clipboard.cc
View file

@ -10,11 +10,14 @@
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkImageInfo.h" #include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/core/SkPixmap.h" #include "third_party/skia/include/core/SkPixmap.h"
#include "third_party/skia/tools/sk_tool_utils.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/clipboard/scoped_clipboard_writer.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
namespace sk_tool_utils {
bool copy_to(SkBitmap* dst, SkColorType dstCT, const SkBitmap& src);
}
namespace atom { namespace atom {
namespace api { namespace api {
@ -173,7 +176,7 @@ void Clipboard::WriteImage(const gfx::Image& image, mate::Arguments* args) {
SkBitmap orig = image.AsBitmap(); SkBitmap orig = image.AsBitmap();
SkBitmap bmp; SkBitmap bmp;
if (sk_tool_utils::copy_to(&bmp, orig.colorType(), &orig)) { if (sk_tool_utils::copy_to(&bmp, orig.colorType(), orig)) {
writer.WriteImage(bmp); writer.WriteImage(bmp);
} else { } else {
writer.WriteImage(orig); writer.WriteImage(orig);

2
common.gypi
View file

@ -146,8 +146,6 @@
'<(libchromiumcontent_src_dir)', '<(libchromiumcontent_src_dir)',
'<(libchromiumcontent_src_dir)/third_party/icu/source/common', '<(libchromiumcontent_src_dir)/third_party/icu/source/common',
'<(libchromiumcontent_src_dir)/third_party/icu/source/i18n', '<(libchromiumcontent_src_dir)/third_party/icu/source/i18n',
'<(libchromiumcontent_src_dir)/third_party/skia/include/utils',
'<(libchromiumcontent_src_dir)/third_party/skia/include/private',
'<(libchromiumcontent_src_dir)/v8', '<(libchromiumcontent_src_dir)/v8',
'<(libchromiumcontent_src_dir)/v8/include', '<(libchromiumcontent_src_dir)/v8/include',
], ],