mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
c44d60cfe4
* chore: bump chromium in DEPS to 148.0.7749.0 * chore: bump chromium in DEPS to 148.0.7751.0 * chore: update patches * 7681299: Introduce OccludedWidgetInputProtector to track always-on-top widgets Refs https://chromium-review.googlesource.com/c/chromium/src/+/7681299 * 7685453: chrome://accessibility: Don't AllowJavascript() in async calls Refs https://chromium-review.googlesource.com/c/chromium/src/+/7685453 * 7665878: Prefer browser runtime over Node.js in HostRuntime detection Refs https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7665878 * 7674037: Rename the bookmark-related interfaces of the Clipboard class to URL. Refs https://chromium-review.googlesource.com/c/chromium/src/+/7674037 * 7621713: Migrate ServiceWorker framework to ChildProcessId Refs https://chromium-review.googlesource.com/c/chromium/src/+/7621713 * 7680500: Migrate ServiceWorkerHost to ChildProcessId Refs https://chromium-review.googlesource.com/c/chromium/src/+/7680500 * chore: update roller commit message lint script to handle devtools CLs --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Henri Torgemane <henrit@gmail.com>
|
|
Date: Thu, 23 Sep 2021 21:30:33 -0500
|
|
Subject: add ui::ScopedCliboardWriter::WriteUnsafeRawData
|
|
|
|
This restores some ability to write to the clipboard using raw formats, which
|
|
was removed as part of the Raw Clipboard API scrubbing.
|
|
https://bugs.chromium.org/p/chromium/issues/detail?id=1217643
|
|
|
|
diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
|
|
index 12695bb8f3d2cc3f498e5c6e37e4729d9586962f..6bd7b6f2908d3c8316191e3106e50b2137068a0f 100644
|
|
--- a/ui/base/clipboard/scoped_clipboard_writer.cc
|
|
+++ b/ui/base/clipboard/scoped_clipboard_writer.cc
|
|
@@ -239,6 +239,16 @@ void ScopedClipboardWriter::WriteData(std::u16string_view format,
|
|
}
|
|
}
|
|
|
|
+void ScopedClipboardWriter::WriteUnsafeRawData(const std::u16string& format,
|
|
+ mojo_base::BigBuffer data) {
|
|
+ static constexpr int kMaxRegisteredFormats = 100;
|
|
+ if (counter_ >= kMaxRegisteredFormats)
|
|
+ return;
|
|
+ counter_++;
|
|
+ platform_representations_.push_back(
|
|
+ {base::UTF16ToUTF8(format), std::move(data)});
|
|
+}
|
|
+
|
|
void ScopedClipboardWriter::Reset() {
|
|
objects_.clear();
|
|
raw_objects_.clear();
|
|
diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
|
|
index 7d7d015f9725ef39b7d5e82b83ac5195e2cfe309..83565b6d73cbe30e3c24913468862173cfd3a83e 100644
|
|
--- a/ui/base/clipboard/scoped_clipboard_writer.h
|
|
+++ b/ui/base/clipboard/scoped_clipboard_writer.h
|
|
@@ -91,6 +91,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD) ScopedClipboardWriter {
|
|
// This is only used to write custom format data.
|
|
void WriteData(std::u16string_view format, mojo_base::BigBuffer data);
|
|
|
|
+ // write raw (non-pickled) data to the clipboard
|
|
+ void WriteUnsafeRawData(const std::u16string& format,
|
|
+ mojo_base::BigBuffer data);
|
|
+
|
|
void WriteImage(const SkBitmap& bitmap);
|
|
|
|
// Mark the data to be written as confidential.
|