From 1727a9eca999a010dd9b43e6c8348f7c525aa084 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Sat, 14 Apr 2018 21:23:05 -0400 Subject: [PATCH] pull up definition and remove include --- atom/browser/api/atom_api_auto_updater.cc | 2 ++ atom/common/api/atom_api_clipboard.cc | 7 +++++-- common.gypi | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/atom/browser/api/atom_api_auto_updater.cc b/atom/browser/api/atom_api_auto_updater.cc index 88a58f6bca6b..5d736ad43d7b 100644 --- a/atom/browser/api/atom_api_auto_updater.cc +++ b/atom/browser/api/atom_api_auto_updater.cc @@ -104,6 +104,8 @@ void AutoUpdater::SetFeedURL(mate::Arguments* args) { } void AutoUpdater::QuitAndInstall() { + Emit("before-quit-for-update"); + // If we don't have any window then quitAndInstall immediately. if (WindowList::IsEmpty()) { auto_updater::AutoUpdater::QuitAndInstall(); diff --git a/atom/common/api/atom_api_clipboard.cc b/atom/common/api/atom_api_clipboard.cc index 6b0c97078ce2..2cd4070fba2e 100644 --- a/atom/common/api/atom_api_clipboard.cc +++ b/atom/common/api/atom_api_clipboard.cc @@ -10,11 +10,14 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkImageInfo.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 "atom/common/node_includes.h" +namespace sk_tool_utils { + bool copy_to(SkBitmap* dst, SkColorType dstCT, const SkBitmap& src); +} + namespace atom { namespace api { @@ -173,7 +176,7 @@ void Clipboard::WriteImage(const gfx::Image& image, mate::Arguments* args) { SkBitmap orig = image.AsBitmap(); 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); } else { writer.WriteImage(orig); diff --git a/common.gypi b/common.gypi index d65a44308e0d..5c6677b333ef 100644 --- a/common.gypi +++ b/common.gypi @@ -146,8 +146,6 @@ '<(libchromiumcontent_src_dir)', '<(libchromiumcontent_src_dir)/third_party/icu/source/common', '<(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/include', ],