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

chore: bump chromium to 94.0.4584.0 (main) (#30030)

Browse source 
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
electron-roller[bot] 2021-07-26 09:02:16 -07:00 • committed by GitHub
parent a6ab702ae4
commit 64ba8feb93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
97 changed files with 531 additions and 553 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,14 +108,14 @@ std::u16string Clipboard::ReadText(gin_helper::Arguments* args) {
std::u16string data;
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
auto type = GetClipboardBuffer(args);
if (clipboard->IsFormatAvailable(ui::ClipboardFormatType::GetPlainTextType(),
if (clipboard->IsFormatAvailable(ui::ClipboardFormatType::PlainTextType(),
type, /* data_dst = */ nullptr)) {
clipboard->ReadText(type, /* data_dst = */ nullptr, &data);
} else {
#if defined(OS_WIN)
if (clipboard->IsFormatAvailable(
ui::ClipboardFormatType::GetPlainTextAType(), type,
/* data_dst = */ nullptr)) {
if (clipboard->IsFormatAvailable(ui::ClipboardFormatType::PlainTextAType(),
type,
/* data_dst = */ nullptr)) {
std::string result;
clipboard->ReadAsciiText(type, /* data_dst = */ nullptr, &result);
data = base::ASCIIToUTF16(result);