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

fix: use nested run loop in clipboard.readImage (#39466)

Browse source
This commit is contained in:
Cheng Zhao 2023-08-14 17:35:37 +09:00 • committed by GitHub
parent 08bbff5361
commit cf658b700d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
shell/common/api/electron_api_clipboard.cc
View file

@ -9,6 +9,7 @@
#include "base/containers/contains.h" #include "base/containers/contains.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "shell/browser/browser.h"
#include "shell/common/gin_converters/image_converter.h" #include "shell/common/gin_converters/image_converter.h"
#include "shell/common/gin_helper/dictionary.h" #include "shell/common/gin_helper/dictionary.h"
#include "shell/common/node_includes.h" #include "shell/common/node_includes.h"
@ -220,10 +221,18 @@ void Clipboard::WriteBookmark(const std::u16string& title,
} }
gfx::Image Clipboard::ReadImage(gin_helper::Arguments* args) { gfx::Image Clipboard::ReadImage(gin_helper::Arguments* args) {
// The ReadPng uses thread pool which requires app ready.
if (IsBrowserProcess() && !Browser::Get()->is_ready()) {
args->ThrowError(
"clipboard.readImage is available only after app ready in the main "
"process");
return gfx::Image();
}
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
absl::optional<gfx::Image> image; absl::optional<gfx::Image> image;
base::RunLoop run_loop; base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed);
base::RepeatingClosure callback = run_loop.QuitClosure(); base::RepeatingClosure callback = run_loop.QuitClosure();
clipboard->ReadPng( clipboard->ReadPng(
GetClipboardBuffer(args), GetClipboardBuffer(args),

5
spec/api-clipboard-spec.ts
View file

@ -16,6 +16,11 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard
const readImage = clipboard.readImage(); const readImage = clipboard.readImage();
expect(readImage.toDataURL()).to.equal(i.toDataURL()); expect(readImage.toDataURL()).to.equal(i.toDataURL());
}); });
it('works for empty image', () => {
clipboard.writeText('Not an Image');
expect(clipboard.readImage().isEmpty()).to.be.true();
});
}); });
describe('clipboard.readText()', () => { describe('clipboard.readText()', () => {