summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2022-11-11 16:21:34 +0100
committerPeter Varga <pvarga@inf.u-szeged.hu>2022-11-14 08:55:17 +0000
commitb77c9ebc4dc0564db89b4e7647b26a14f9eb17ec (patch)
treeea130a70c952f35cc7eec8e83f4cb956bd32e9b6
parent0e6f6c964256358e4970442d130c09a1320b1666 (diff)
downloadqtwebengine-chromium-b77c9ebc4dc0564db89b4e7647b26a14f9eb17ec.tar.gz
[Backport] libstdc++: do not make ReverseBeaconTimeoutSorter function call operator constexpr
In C++17 STL, std::sort is not a constexpr in any case. So we do not get any benefit from making ReverseBeaconTimeoutSorter a constexpr. This will fail, as in GCC the function call operator is implicitly virtual, and virtuals cannot be constexpr before C++20. Bug: 819294, 957519 Change-Id: I5894605fb3ee9478b1c5aef626025ea3fd6aeeca Review-URL: https://chromium-review.googlesource.com/c/chromium/src/+/3864599 Cr-Commit-Position: refs/heads/main@{#1042121} Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/442970 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/third_party/blink/renderer/core/frame/pending_beacon_dispatcher.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/core/frame/pending_beacon_dispatcher.cc b/chromium/third_party/blink/renderer/core/frame/pending_beacon_dispatcher.cc
index 777921b9b5f..aef913ae850 100644
--- a/chromium/third_party/blink/renderer/core/frame/pending_beacon_dispatcher.cc
+++ b/chromium/third_party/blink/renderer/core/frame/pending_beacon_dispatcher.cc
@@ -25,9 +25,8 @@ namespace {
constexpr base::TimeDelta kBeaconTimeoutInterval = base::Milliseconds(100);
struct ReverseBeaconTimeoutSorter {
- constexpr bool operator()(
- const Member<PendingBeaconDispatcher::PendingBeacon>& lhs,
- const Member<PendingBeaconDispatcher::PendingBeacon>& rhs) {
+ bool operator()(const Member<PendingBeaconDispatcher::PendingBeacon>& lhs,
+ const Member<PendingBeaconDispatcher::PendingBeacon>& rhs) {
// Negative timeout is not accepted.
DCHECK(!lhs->GetBackgroundTimeout().is_negative());
DCHECK(!rhs->GetBackgroundTimeout().is_negative());