df6ad9c970* chore: bump chromium in DEPS to 140.0.7324.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 140.0.7325.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: remove @dsanders11's unused include patch CL: https://chromium-review.googlesource.com/c/chromium/src/+/6782507 Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * fix: apply keychain patch to new apple subdir CL: https://chromium-review.googlesource.com/c/chromium/src/+/6736212 Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * chore: update chromium patches Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * chore: update other patches Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * chore: bump chromium in DEPS to 140.0.7327.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fix: mistake in reapplied patch Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * fixup! fix: apply keychain patch to new apple subdir CL: https://chromium-review.googlesource.com/c/chromium/src/+/6736212 Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * chore: update patches Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * fix: remove OnPrivateNetworkAccessPermissionRequired override CL: https://chromium-review.googlesource.com/c/chromium/src/+/6769208 Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * fix: update colorSpace property to use new unified value CL: https://chromium-review.googlesource.com/c/chromium/src/+/6795085 Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * fix: include OverlayWindowLiveCaptionButton CL: https://chromium-review.googlesource.com/c/chromium/src/+/6787420 Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * fixup! fix: apply keychain patch to new apple subdir CL: https://chromium-review.googlesource.com/c/chromium/src/+/6736212 Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * fix: format chromium_src/BUILD.gn CL: https://chromium-review.googlesource.com/c/chromium/src/+/6787427 Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * fix: format BUILD.gn CL: https://chromium-review.googlesource.com/c/chromium/src/+/6787427 Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * chore: include script/ in logged path Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * fix: update filenames.libcxx.gni CL: https://chromium-review.googlesource.com/c/chromium/src/+/6787279 Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: clavin <clavin@electronjs.org>
45 lines
2 KiB
Diff
45 lines
2 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 4aa6a6cd282943025c82a6a611268270e9eb6568..878cad6d367a7e361aff276a139cb613207680f6 100644
|
|
--- a/ui/base/clipboard/scoped_clipboard_writer.cc
|
|
+++ b/ui/base/clipboard/scoped_clipboard_writer.cc
|
|
@@ -234,6 +234,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 939a99b2a086d5373f82fe96da73dabe02f6f9d8..fccc200b1b11076c8fcffde071a53598ffba9a12 100644
|
|
--- a/ui/base/clipboard/scoped_clipboard_writer.h
|
|
+++ b/ui/base/clipboard/scoped_clipboard_writer.h
|
|
@@ -87,6 +87,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.
|