github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 98ebf6c3f0b7bd96bdb1a4b42208f (master) (#22999)

Browse Source 
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Electron Bot <anonymous@electronjs.org>
Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
This commit is contained in:
Electron Bot
2020-04-13 16:39:26 -07:00
committed by GitHub
parent b8c1709a88
commit 3e8d77d564
106 changed files with 645 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
shell/common/api/electron_api_clipboard.cc
View File

@@ -180,8 +180,16 @@ void Clipboard::WriteBookmark(const base::string16& title,
gfx::Image Clipboard::ReadImage(gin_helper::Arguments* args) {
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
SkBitmap bitmap = clipboard->ReadImage(GetClipboardBuffer(args));
return gfx::Image::CreateFrom1xBitmap(bitmap);
base::Optional<gfx::Image> image;
clipboard->ReadImage(
GetClipboardBuffer(args),
base::Bind(
[](base::Optional<gfx::Image>* image, const SkBitmap& result) {
image->emplace(gfx::Image::CreateFrom1xBitmap(result));
},
&image));
DCHECK(image.has_value());
return image.value();
}
void Clipboard::WriteImage(const gfx::Image& image,