diff --git a/shell/common/api/electron_api_clipboard.cc b/shell/common/api/electron_api_clipboard.cc index 9e6d8e7d9b14..88824670e636 100644 --- a/shell/common/api/electron_api_clipboard.cc +++ b/shell/common/api/electron_api_clipboard.cc @@ -51,6 +51,17 @@ bool Clipboard::Has(const std::string& format_string, std::string Clipboard::Read(const std::string& format_string) { ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); + ui::ClipboardFormatType format( + ui::ClipboardFormatType::CustomPlatformType(format_string)); + + std::string data; + clipboard->ReadData(format, /* data_dst = */ nullptr, &data); + return data; +} + +v8::Local Clipboard::ReadBuffer(const std::string& format_string, + gin_helper::Arguments* args) { + ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); std::map custom_format_names; custom_format_names = clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste, @@ -68,12 +79,6 @@ std::string Clipboard::Read(const std::string& format_string) { std::string data; clipboard->ReadData(format, /* data_dst = */ nullptr, &data); - return data; -} - -v8::Local Clipboard::ReadBuffer(const std::string& format_string, - gin_helper::Arguments* args) { - std::string data = Read(format_string); return node::Buffer::Copy(args->isolate(), data.data(), data.length()) .ToLocalChecked(); } diff --git a/spec/api-clipboard-spec.js b/spec/api-clipboard-spec.js index 7ca0932f1538..d812d0c7c7e8 100644 --- a/spec/api-clipboard-spec.js +++ b/spec/api-clipboard-spec.js @@ -44,13 +44,7 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard }); }); - describe('clipboard.readBookmark', () => { - before(function () { - if (process.platform === 'linux') { - this.skip(); - } - }); - + ifdescribe(process.platform !== 'linux')('clipboard.readBookmark', () => { it('returns title and url', () => { clipboard.writeBookmark('a title', 'https://electronjs.org'); @@ -68,6 +62,16 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard }); }); + ifdescribe(process.platform !== 'linux')('clipboard.read()', () => { + it('does not crash when reading various custom clipboard types', () => { + const type = process.platform === 'darwin' ? 'NSFilenamesPboardType' : 'FileNameW'; + + expect(() => { + const result = clipboard.read(type); + }).to.not.throw(); + }); + }); + describe('clipboard.write()', () => { it('returns data correctly', () => { const text = 'test'; @@ -100,13 +104,7 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard }); }); - describe('clipboard.read/writeFindText(text)', () => { - before(function () { - if (process.platform !== 'darwin') { - this.skip(); - } - }); - + ifdescribe(process.platform === 'darwin')('clipboard.read/writeFindText(text)', () => { it('reads and write text to the find pasteboard', () => { clipboard.writeFindText('find this'); expect(clipboard.readFindText()).to.equal('find this');