parent
c51e5ee515
commit
7f95442232
@ -0,0 +1,65 @@
|
||||
diff -up chromium-116.0.5845.96/cc/paint/paint_op_writer.h.me chromium-116.0.5845.96/cc/paint/paint_op_writer.h
|
||||
--- chromium-116.0.5845.96/cc/paint/paint_op_writer.h.me 2023-08-16 19:09:48.998173285 +0200
|
||||
+++ chromium-116.0.5845.96/cc/paint/paint_op_writer.h 2023-08-16 21:13:44.442431527 +0200
|
||||
@@ -104,7 +104,16 @@ class CC_PAINT_EXPORT PaintOpWriter {
|
||||
|
||||
private:
|
||||
template <typename T>
|
||||
- static constexpr size_t SerializedSizeSimple();
|
||||
+ static constexpr size_t SerializedSizeSimple() {
|
||||
+ static_assert(!std::is_pointer_v<T>);
|
||||
+ return base::bits::AlignUp(sizeof(T), kDefaultAlignment);
|
||||
+ }
|
||||
+ // size_t is always serialized as uint64_t to make the serialized result
|
||||
+ // portable between 32bit and 64bit processes.
|
||||
+ template <>
|
||||
+ constexpr size_t SerializedSizeSimple<size_t>() {
|
||||
+ return base::bits::AlignUp(sizeof(uint64_t), kDefaultAlignment);
|
||||
+ }
|
||||
|
||||
public:
|
||||
// SerializedSize() returns the maximum serialized size of the given type or
|
||||
@@ -115,7 +124,10 @@ class CC_PAINT_EXPORT PaintOpWriter {
|
||||
// deserialization, and make it possible to allow dynamic sizing for some
|
||||
// data types (see the specialized/overloaded functions).
|
||||
template <typename T>
|
||||
- static constexpr size_t SerializedSize();
|
||||
+ static constexpr size_t SerializedSize() {
|
||||
+ static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>);
|
||||
+ return SerializedSizeSimple<T>();
|
||||
+ }
|
||||
template <typename T>
|
||||
static constexpr size_t SerializedSize(const T& data);
|
||||
static size_t SerializedSize(const PaintImage& image);
|
||||
@@ -360,19 +372,6 @@ class CC_PAINT_EXPORT PaintOpWriter {
|
||||
const bool enable_security_constraints_;
|
||||
};
|
||||
|
||||
-template <typename T>
|
||||
-constexpr size_t PaintOpWriter::SerializedSizeSimple() {
|
||||
- static_assert(!std::is_pointer_v<T>);
|
||||
- return base::bits::AlignUp(sizeof(T), kDefaultAlignment);
|
||||
-}
|
||||
-
|
||||
-// size_t is always serialized as two uint32_ts to make the serialized result
|
||||
-// portable between 32bit and 64bit processes.
|
||||
-template <>
|
||||
-constexpr size_t PaintOpWriter::SerializedSizeSimple<size_t>() {
|
||||
- return base::bits::AlignUp(2 * sizeof(uint32_t), kDefaultAlignment);
|
||||
-}
|
||||
-
|
||||
template <>
|
||||
constexpr size_t PaintOpWriter::SerializedSize<SkGainmapInfo>() {
|
||||
return SerializedSizeSimple<SkColor4f>() + // fGainmapRatioMin
|
||||
@@ -386,11 +385,6 @@ constexpr size_t PaintOpWriter::Serializ
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
-constexpr size_t PaintOpWriter::SerializedSize() {
|
||||
- static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>);
|
||||
- return SerializedSizeSimple<T>();
|
||||
-}
|
||||
-template <typename T>
|
||||
constexpr size_t PaintOpWriter::SerializedSize(const T& data) {
|
||||
return SerializedSizeSimple<T>();
|
||||
}
|
@ -0,0 +1,47 @@
|
||||
diff -up chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c.me chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c
|
||||
--- chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c.me 2022-12-24 11:08:03.212333476 +0100
|
||||
+++ chromium-108.0.5359.124/third_party/wayland/src/src/wayland-shm.c 2022-12-24 11:08:18.316606155 +0100
|
||||
@@ -44,7 +44,7 @@
|
||||
#include <signal.h>
|
||||
#include <pthread.h>
|
||||
#include <errno.h>
|
||||
-#include <fcntl.h>
|
||||
+#include <linux/fcntl.h>
|
||||
|
||||
#include "wayland-os.h"
|
||||
#include "wayland-util.h"
|
||||
diff -up chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc.el7-memfd-include chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc
|
||||
--- chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc.el7-memfd-include 2022-06-15 10:52:49.553817031 -0400
|
||||
+++ chromium-102.0.5005.115/v8/src/base/platform/platform-posix.cc 2022-06-15 10:56:15.775173013 -0400
|
||||
@@ -56,6 +56,7 @@
|
||||
|
||||
#if V8_OS_LINUX
|
||||
#include <sys/prctl.h> // for prctl
|
||||
+#include <linux/memfd.h> // for MFD_CLOEXEC
|
||||
#endif
|
||||
|
||||
#if defined(V8_OS_FUCHSIA)
|
||||
diff -up iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c.me iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c
|
||||
--- iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c.me 2022-12-08 21:59:43.502200984 +0100
|
||||
+++ iridium-browser-2022.12.108.1/third_party/wayland/src/cursor/os-compatibility.c 2022-12-08 22:13:53.375653343 +0100
|
||||
@@ -29,7 +29,8 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
-#include <fcntl.h>
|
||||
+#include <linux/fcntl.h> // for F_SEAL_SHRINK, F_ADD_SEALS, F_SEAL_SEAL
|
||||
+#include <linux/memfd.h> // for MFD_CLOEXEC
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
diff -up chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.me chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
|
||||
--- chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.me 2023-08-17 06:32:32.484538849 +0200
|
||||
+++ chromium-116.0.5845.96/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc 2023-08-17 07:02:01.965168328 +0200
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.h"
|
||||
|
||||
#include <sys/mman.h>
|
||||
+#include <linux/memfd.h>
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
@ -0,0 +1,13 @@
|
||||
diff -up chromium-117.0.5938.62/content/browser/interest_group/header_direct_from_seller_signals.cc.me chromium-117.0.5938.62/content/browser/interest_group/header_direct_from_seller_signals.cc
|
||||
--- chromium-117.0.5938.62/content/browser/interest_group/header_direct_from_seller_signals.cc.me 2023-09-16 09:43:41.717545215 +0200
|
||||
+++ chromium-117.0.5938.62/content/browser/interest_group/header_direct_from_seller_signals.cc 2023-09-16 09:48:07.319539585 +0200
|
||||
@@ -187,7 +187,8 @@ void OnJsonDecoded(std::unique_ptr<const
|
||||
|
||||
} // namespace
|
||||
|
||||
-HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() = default;
|
||||
+HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() :
|
||||
+ seller_signals_(absl::nullopt), auction_signals_(absl::nullopt) { }
|
||||
|
||||
HeaderDirectFromSellerSignals::~HeaderDirectFromSellerSignals() = default;
|
||||
|
Loading…
Reference in new issue