diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-13 13:54:17 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-28 14:24:35 +0100 |
commit | 42af15c421a520499bc872e2d55053dcffb2a07b (patch) | |
tree | c0e8836daec4903254c7ae633eb8ef27a4502f00 /src/core/clipboard_qt.h | |
parent | 01d4c6440b52f2ce26ced45b6ad193e909db44af (diff) |
Adaptations for Chromium 78
Including removal of renderer service.
[ChangeLog][QWebEngineSetting] XSS Auditing has been removed, and
XSSAuditingEnabled no longer has any effect.
Change-Id: I0835e2a76551057f3eea30a343e0373b642192f0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/clipboard_qt.h')
-rw-r--r-- | src/core/clipboard_qt.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/clipboard_qt.h b/src/core/clipboard_qt.h index 7884da167..9dde1f977 100644 --- a/src/core/clipboard_qt.h +++ b/src/core/clipboard_qt.h @@ -46,25 +46,25 @@ namespace QtWebEngineCore { class ClipboardQt : public ui::Clipboard { public: - uint64_t GetSequenceNumber(ui::ClipboardType type) const override; - bool IsFormatAvailable(const ui::ClipboardFormatType &format, ui::ClipboardType type) const override; - void Clear(ui::ClipboardType type) override; - void ReadAvailableTypes(ui::ClipboardType type, std::vector<base::string16> *types, + uint64_t GetSequenceNumber(ui::ClipboardBuffer type) const override; + bool IsFormatAvailable(const ui::ClipboardFormatType &format, ui::ClipboardBuffer type) const override; + void Clear(ui::ClipboardBuffer type) override; + void ReadAvailableTypes(ui::ClipboardBuffer type, std::vector<base::string16> *types, bool *contains_filenames) const override; - void ReadText(ui::ClipboardType type, base::string16 *result) const override; - void ReadAsciiText(ui::ClipboardType type, std::string *result) const override; - void ReadHTML(ui::ClipboardType type, base::string16 *markup, std::string *src_url, uint32_t *fragment_start, + void ReadText(ui::ClipboardBuffer type, base::string16 *result) const override; + void ReadAsciiText(ui::ClipboardBuffer type, std::string *result) const override; + void ReadHTML(ui::ClipboardBuffer type, base::string16 *markup, std::string *src_url, uint32_t *fragment_start, uint32_t *fragment_end) const override; - void ReadRTF(ui::ClipboardType type, std::string *result) const override; - SkBitmap ReadImage(ui::ClipboardType type) const override; - void ReadCustomData(ui::ClipboardType clipboard_type, const base::string16 &type, base::string16 *result) const override; + void ReadRTF(ui::ClipboardBuffer type, std::string *result) const override; + SkBitmap ReadImage(ui::ClipboardBuffer type) const override; + void ReadCustomData(ui::ClipboardBuffer clipboard_type, const base::string16 &type, base::string16 *result) const override; void ReadBookmark(base::string16 *title, std::string *url) const override; void ReadData(const ui::ClipboardFormatType &format, std::string *result) const override; void OnPreShutdown() override {} protected: - void WriteObjects(ui::ClipboardType type, const ObjectMap &objects) override; + void WriteObjects(ui::ClipboardBuffer type, const ObjectMap &objects) override; void WriteText(const char *text_data, size_t text_len) override; void WriteHTML(const char *markup_data, size_t markup_len, const char *url_data, size_t url_len) override; void WriteRTF(const char *rtf_data, size_t data_len) override; |