chore: bump chromium to 104.0.5073.0 (main) (#34272)

This commit is contained in:
electron-roller[bot] 2022-06-01 08:12:47 +02:00 committed by GitHub
parent 3849d19e14
commit 470396d6ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
112 changed files with 663 additions and 589 deletions

View file

@ -108,21 +108,34 @@ class DataPipeReader {
// Note that the lifetime of the native buffer belongs to us, and we will
// free memory when JS buffer gets garbage collected.
v8::HandleScope handle_scope(promise_.isolate());
#if defined(V8_SANDBOX)
v8::Local<v8::Value> buffer =
node::Buffer::Copy(promise_.isolate(), &buffer_.front(), buffer_.size())
.ToLocalChecked();
promise_.Resolve(buffer);
#else
v8::Local<v8::Value> buffer =
node::Buffer::New(promise_.isolate(), &buffer_.front(), buffer_.size(),
&DataPipeReader::FreeBuffer, this)
.ToLocalChecked();
promise_.Resolve(buffer);
#endif
// Destroy data pipe.
handle_watcher_.Cancel();
#if defined(V8_SANDBOX)
delete this;
#else
data_pipe_.reset();
data_pipe_getter_.reset();
#endif
}
#if !defined(V8_SANDBOX)
static void FreeBuffer(char* data, void* self) {
delete static_cast<DataPipeReader*>(self);
}
#endif
gin_helper::Promise<v8::Local<v8::Value>> promise_;

View file

@ -9,7 +9,7 @@
#include "base/containers/contains.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/extensions/command.h"
#include "extensions/common/command.h"
#include "gin/dictionary.h"
#include "gin/object_template_builder.h"
#include "shell/browser/api/electron_api_system_preferences.h"

View file

@ -54,7 +54,7 @@ bool WebContents::PlatformHandleKeyboardEvent(
return false;
// Send the event to the menu before sending it to the window
if (event.os_event.type == NSKeyDown &&
if (event.os_event.type == NSEventTypeKeyDown &&
[[NSApp mainMenu] performKeyEquivalent:event.os_event])
return true;