26 lines
2.2 KiB
Diff
26 lines
2.2 KiB
Diff
diff -up qtwebengine-everywhere-src-5.15.15-20230710/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.omv~ qtwebengine-everywhere-src-5.15.15-20230710/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
|
|
--- qtwebengine-everywhere-src-5.15.15-20230710/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.omv~ 2023-07-13 07:13:16.365747492 +0200
|
|
+++ qtwebengine-everywhere-src-5.15.15-20230710/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h 2023-07-13 07:13:28.928843534 +0200
|
|
@@ -196,7 +196,7 @@ NumPartitionPagesPerSuperPage() {
|
|
// platforms, as Chrome's requirement is C++14 as of 2020.
|
|
#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
|
|
static constexpr size_t kAlignment =
|
|
- std::max(alignof(std::max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__);
|
|
+ std::max(alignof(std::max_align_t), static_cast<size_t>(__STDCPP_DEFAULT_NEW_ALIGNMENT__));
|
|
#else
|
|
static constexpr size_t kAlignment = alignof(std::max_align_t);
|
|
#endif
|
|
diff -up qtwebengine-everywhere-src-5.15.15-20230710/src/3rdparty/chromium/third_party/abseil-cpp/absl/utility/utility.h.omv~ qtwebengine-everywhere-src-5.15.15-20230710/src/3rdparty/chromium/third_party/abseil-cpp/absl/utility/utility.h
|
|
diff -up qtwebengine-everywhere-src-5.15.15-20230710/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc.omv~ qtwebengine-everywhere-src-5.15.15-20230710/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
|
|
--- qtwebengine-everywhere-src-5.15.15-20230710/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc.omv~ 2023-07-13 09:10:16.273013908 +0200
|
|
+++ qtwebengine-everywhere-src-5.15.15-20230710/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc 2023-07-13 09:10:29.104133225 +0200
|
|
@@ -16,6 +16,8 @@
|
|
#include "third_party/blink/renderer/core/page/scrolling/text_fragment_finder.h"
|
|
#include "third_party/blink/renderer/platform/text/text_boundaries.h"
|
|
|
|
+#include <absl/base/attributes.h>
|
|
+
|
|
namespace blink {
|
|
|
|
namespace {
|