[patch] qtwebengine-5.15.10_p20230815-re2_StringPiece_set.patch

qtwebengine-5.15.10_p20230815-re2_StringPiece_set.patch (text/plain), 2.52 KB, created by pva on 2023-09-30 20:22:24 UTC

Modified to suite dev-qt/qtwebengine-5.15.10_p20230815

From 0bfda71ae38597646a21e3141a9b95e74cc95636 Mon Sep 17 00:00:00 2001
From: Martin Negyokru <[e-mail]>
Date: Wed, 16 Aug 2023 13:52:22 +0200
Subject: [PATCH] [Backport] Replace uses of re2::StringPiece::set().

RE2 has taken a dependency on Abseil. re2::StringPiece is (for now)
an alias; its old member functions no longer exist. This CL is just
one of many needed to unblock updating Chromium's copy of RE2 soon.

Bug: 1447090
Change-Id: I23e94fd3b55c615f4cbe03350ede9bf1eaa4f73d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4549044
Owners-Override: Nico Weber <[e-mail]>
Auto-Submit: Paul Wankadia <[e-mail]>
Commit-Queue: Nico Weber <[e-mail]>
Reviewed-by: Muhammad Hasan Khan <[e-mail]>
Reviewed-by: Nico Weber <[e-mail]>
Cr-Commit-Position: refs/heads/main@{#1146652}
Fixes: QTBUG-115931
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/497030
Reviewed-by: Allan Sandfeld Jensen <[e-mail]>
(cherry picked from commit 3e6cb8936d3b00a9af375875d240d912d53af851)
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/507097
Reviewed-by: Qt Cherry-pick Bot <[e-mail]>
---
 .../extensions/browser/api/web_request/form_data_parser.cc    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chromium/extensions/browser/api/web_request/form_data_parser.cc b/chromium/extensions/browser/api/web_request/form_data_parser.cc
index 58e137bb78c2..5a201e5c6ab2 100644
--- a/src/3rdparty/chromium/extensions/browser/api/web_request/form_data_parser.cc
+++ b/src/3rdparty/chromium/extensions/browser/api/web_request/form_data_parser.cc
@@ -426,7 +426,7 @@ bool FormDataParserUrlEncoded::GetNextNameValue(Result* result) {
 bool FormDataParserUrlEncoded::SetSource(base::StringPiece source) {
   if (source_set_)
     return false;  // We do not allow multiple sources for this parser.
-  source_.set(source.data(), source.size());
+  source_ = re2::StringPiece(source.data(), source.size());
   source_set_ = true;
   source_malformed_ = false;
   return true;
@@ -570,7 +570,7 @@ bool FormDataParserMultipart::GetNextNameValue(Result* result) {
 bool FormDataParserMultipart::SetSource(base::StringPiece source) {
   if (source.data() == nullptr || !source_.empty())
     return false;
-  source_.set(source.data(), source.size());
+  source_ = re2::StringPiece(source.data(), source.size());
 
   switch (state_) {
     case STATE_INIT: