Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: c3036d4557
Branches Tags
electron
/
patches
/
chromium
/
add_ui_scopedcliboardwriter_writeunsaferawdata.patch

add_ui_scopedcliboardwriter_writeunsaferawdata.patch 2.0 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Henri Torgemane <[email protected]>
    3. 

  3. Date: Thu, 23 Sep 2021 21:30:33 -0500
    4. 

  4. Subject: add ui::ScopedCliboardWriter::WriteUnsafeRawData
    5. 

  5. 

  6. This restores some ability to write to the clipboard using raw formats, which
    7. 

  7. was removed as part of the Raw Clipboard API scrubbing.
    8. 

  8. https://bugs.chromium.org/p/chromium/issues/detail?id=1217643
    9. 

  9. 

  10. diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
    11. 

  11. index e27df1c5b234490a2679fc3428e59b92970f1ec0..54a0be1dde7d059f5102ead4a77b828eff1eeadb 100644
    12. 

  12. --- a/ui/base/clipboard/scoped_clipboard_writer.cc
    13. 

  13. +++ b/ui/base/clipboard/scoped_clipboard_writer.cc
    14. 

  14. @@ -239,6 +239,16 @@ void ScopedClipboardWriter::WriteEncodedDataTransferEndpointForTesting(
    15. 

  15.  }
    16. 

  16.  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
    17. 

  17.  
    18. 

  18. +void ScopedClipboardWriter::WriteUnsafeRawData(const std::u16string& format,
    19. 

  19. +                                               mojo_base::BigBuffer data) {
    20. 

  20. +  static constexpr int kMaxRegisteredFormats = 100;
    21. 

  21. +  if (counter_ >= kMaxRegisteredFormats)
    22. 

  22. +    return;
    23. 

  23. +  counter_++;
    24. 

  24. +  platform_representations_.push_back(
    25. 

  25. +      {base::UTF16ToUTF8(format), std::move(data)});
    26. 

  26. +}
    27. 

  27. +
    28. 

  28.  void ScopedClipboardWriter::Reset() {
    29. 

  29.    objects_.clear();
    30. 

  30.    platform_representations_.clear();
    31. 

  31. diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
    32. 

  32. index ec10abcafda69417044a4e792c3637bba5dcd54e..e4ef4f98f3c96c1813f000e185d81ec6082b48ca 100644
    33. 

  33. --- a/ui/base/clipboard/scoped_clipboard_writer.h
    34. 

  34. +++ b/ui/base/clipboard/scoped_clipboard_writer.h
    35. 

  35. @@ -91,6 +91,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD) ScopedClipboardWriter {
    36. 

  36.    // This is only used to write custom format data.
    37. 

  37.    void WriteData(const std::u16string& format, mojo_base::BigBuffer data);
    38. 

  38.  
    39. 

  39. +  // write raw (non-pickled) data to the clipboard
    40. 

  40. +  void WriteUnsafeRawData(const std::u16string& format,
    41. 

  41. +                          mojo_base::BigBuffer data);
    42. 

  42. +
    43. 

  43.    void WriteImage(const SkBitmap& bitmap);
    44. 

  44.  
    45. 

  45.  #if BUILDFLAG(IS_CHROMEOS_LACROS)
    46.