chore: bump chromium to 133.0.6943.35 (35-x-y) (#45217)
* chore: bump chromium in DEPS to 133.0.6943.16
* chore: bump chromium in DEPS to 133.0.6943.27
* chore: bump chromium in DEPS to 133.0.6943.35
* chore: bump chromium to 134.0.6968.0
cherry picked from 75eac86506
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
parent
599030ea08
commit
49078100f4
122 changed files with 682 additions and 622 deletions
|
@ -253,10 +253,10 @@ index fe2d25decd883085e4c3f368ab4acc01a7f66f6e..bcd5c87afcff9c56429443363c63fc80
|
|||
|
||||
// Delegate to V8's allocator for compatibility with the V8 memory cage.
|
||||
diff --git a/src/node_serdes.cc b/src/node_serdes.cc
|
||||
index 7a70997bc024efa4f3ff4cabe30d5e88dcc7bc78..438d6e581a2ee55216f9a9945204b07824fc28a0 100644
|
||||
index 7a70997bc024efa4f3ff4cabe30d5e88dcc7bc78..6552af3ed0acede41c1b16ef77eb359dc54f088a 100644
|
||||
--- a/src/node_serdes.cc
|
||||
+++ b/src/node_serdes.cc
|
||||
@@ -29,6 +29,11 @@ using v8::ValueSerializer;
|
||||
@@ -29,6 +29,26 @@ using v8::ValueSerializer;
|
||||
|
||||
namespace serdes {
|
||||
|
||||
|
@ -264,11 +264,26 @@ index 7a70997bc024efa4f3ff4cabe30d5e88dcc7bc78..438d6e581a2ee55216f9a9945204b078
|
|||
+ static v8::ArrayBuffer::Allocator* allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
|
||||
+ return allocator;
|
||||
+}
|
||||
+
|
||||
+void* Reallocate(void* data, size_t old_length,
|
||||
+ size_t new_length) {
|
||||
+ if (old_length == new_length) return data;
|
||||
+ uint8_t* new_data =
|
||||
+ reinterpret_cast<uint8_t*>(GetAllocator()->AllocateUninitialized(new_length));
|
||||
+ if (new_data == nullptr) return nullptr;
|
||||
+ size_t bytes_to_copy = std::min(old_length, new_length);
|
||||
+ memcpy(new_data, data, bytes_to_copy);
|
||||
+ if (new_length > bytes_to_copy) {
|
||||
+ memset(new_data + bytes_to_copy, 0, new_length - bytes_to_copy);
|
||||
+ }
|
||||
+ GetAllocator()->Free(data, old_length);
|
||||
+ return new_data;
|
||||
+}
|
||||
+
|
||||
class SerializerContext : public BaseObject,
|
||||
public ValueSerializer::Delegate {
|
||||
public:
|
||||
@@ -37,10 +42,15 @@ class SerializerContext : public BaseObject,
|
||||
@@ -37,10 +57,15 @@ class SerializerContext : public BaseObject,
|
||||
|
||||
~SerializerContext() override = default;
|
||||
|
||||
|
@ -284,7 +299,7 @@ index 7a70997bc024efa4f3ff4cabe30d5e88dcc7bc78..438d6e581a2ee55216f9a9945204b078
|
|||
|
||||
static void SetTreatArrayBufferViewsAsHostObjects(
|
||||
const FunctionCallbackInfo<Value>& args);
|
||||
@@ -61,6 +71,7 @@ class SerializerContext : public BaseObject,
|
||||
@@ -61,6 +86,7 @@ class SerializerContext : public BaseObject,
|
||||
|
||||
private:
|
||||
ValueSerializer serializer_;
|
||||
|
@ -292,7 +307,7 @@ index 7a70997bc024efa4f3ff4cabe30d5e88dcc7bc78..438d6e581a2ee55216f9a9945204b078
|
|||
};
|
||||
|
||||
class DeserializerContext : public BaseObject,
|
||||
@@ -144,6 +155,24 @@ Maybe<uint32_t> SerializerContext::GetSharedArrayBufferId(
|
||||
@@ -144,6 +170,24 @@ Maybe<uint32_t> SerializerContext::GetSharedArrayBufferId(
|
||||
return id.ToLocalChecked()->Uint32Value(env()->context());
|
||||
}
|
||||
|
||||
|
@ -301,7 +316,7 @@ index 7a70997bc024efa4f3ff4cabe30d5e88dcc7bc78..438d6e581a2ee55216f9a9945204b078
|
|||
+ size_t* new_length) {
|
||||
+ *new_length = std::max(static_cast<size_t>(4096), requested_size);
|
||||
+ if (old_buffer) {
|
||||
+ void* ret = GetAllocator()->Reallocate(old_buffer, last_length_, *new_length);
|
||||
+ void* ret = Reallocate(old_buffer, last_length_, *new_length);
|
||||
+ last_length_ = *new_length;
|
||||
+ return ret;
|
||||
+ } else {
|
||||
|
@ -317,7 +332,7 @@ index 7a70997bc024efa4f3ff4cabe30d5e88dcc7bc78..438d6e581a2ee55216f9a9945204b078
|
|||
Maybe<bool> SerializerContext::WriteHostObject(Isolate* isolate,
|
||||
Local<Object> input) {
|
||||
MaybeLocal<Value> ret;
|
||||
@@ -209,9 +238,14 @@ void SerializerContext::ReleaseBuffer(const FunctionCallbackInfo<Value>& args) {
|
||||
@@ -209,9 +253,14 @@ void SerializerContext::ReleaseBuffer(const FunctionCallbackInfo<Value>& args) {
|
||||
// Note: Both ValueSerializer and this Buffer::New() variant use malloc()
|
||||
// as the underlying allocator.
|
||||
std::pair<uint8_t*, size_t> ret = ctx->serializer_.Release();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue