chore: bump chromium to 140.0.7281.0 (38-x-y) (#47559)

* chore: bump chromium in DEPS to 139.0.7258.6 * chore: bump chromium in DEPS to 139.0.7258.5 * chore: bump chromium in DEPS to 140.0.7270.1 * chore: bump chromium in DEPS to 140.0.7271.1 * chore: bump chromium in DEPS to 140.0.7273.0 * chore: bump chromium in DEPS to 140.0.7273.1 * chore: bump chromium in DEPS to 140.0.7275.1 * chore: bump chromium in DEPS to 140.0.7275.4 * chore: bump chromium in DEPS to 140.0.7277.1 * chore: bump chromium in DEPS to 140.0.7279.1 * chore: bump chromium in DEPS to 140.0.7281.1 * chore: bump chromium in DEPS to 140.0.7283.1 * chore: bump chromium in DEPS to 140.0.7285.1 * chore: bump chromium in DEPS to 140.0.7287.1 * chore: bump chromium in DEPS to 140.0.7289.0 * chore: bump chromium in DEPS to 140.0.7289.1 * chore: bump chromium in DEPS to 140.0.7291.1 * chore: bump chromium in DEPS to 140.0.7293.1 * chore: bump chromium in DEPS to 140.0.7295.1 * chore: bump chromium in DEPS to 140.0.7296.0 * chore: bump chromium to 140.0.7281.0 (main) (#47616) cherry picked from 603cafad7e * chore: bump chromium in DEPS to 140.0.7269.2 * chore: bump chromium in DEPS to 140.0.7270.0 * chore: bump chromium in DEPS to 140.0.7271.0 * chore: bump chromium in DEPS to 140.0.7273.0 * 6516731: [ExclusiveAccessForAndroid] remove unneeded includes & deps | https://chromium-review.googlesource.com/c/chromium/src/+/6516731 * 6694809: dbus: Ensure systemd scope is started before using any portal services | https://chromium-review.googlesource.com/c/chromium/src/+/6694809 * chore: patch chromium * chore: export patches * chore: bump chromium in DEPS to 140.0.7275.0 * 6677511: [pepper] More pepper removal | https://chromium-review.googlesource.com/c/chromium/src/+/6677511 * 6513641: [gin] Rename gin::Wrappable to gin::DeprecatedWrappable | https://chromium-review.googlesource.com/c/chromium/src/+/6513641 * chore: export chromium patches * 6513641: [gin] Rename gin::Wrappable to gin::DeprecatedWrappable | https://chromium-review.googlesource.com/c/chromium/src/+/6513641 * chore: bump chromium in DEPS to 140.0.7277.0 * chore: bump chromium in DEPS to 140.0.7279.0 * chore: bump chromium in DEPS to 140.0.7281.0 * 6677314: Plumb enabled client hints in the network requestion to network layer https://chromium-review.googlesource.com/c/chromium/src/+/6677314 * 6351556: [source-phase-imports] Support Wasm Source Phase Imports https://chromium-review.googlesource.com/c/chromium/src/+/6351556 * 6700077: [renderer] Avoid calls to deprecated GetIsolate methods https://chromium-review.googlesource.com/c/chromium/src/+/6700077 * 6692873: Reland "Reland "FSA: Only normalize the hardcoded rules once during initialization"" https://chromium-review.googlesource.com/c/chromium/src/+/6692873 * 6686234: [gin] Cleanup NamedPropertyInterceptor for Wrappable https://chromium-review.googlesource.com/c/chromium/src/+/6686234 * chore: export patches * 6667723: Remove content_enable_legacy_ipc GN arg. https://chromium-review.googlesource.com/c/chromium/src/+/6667723 * 6646566: ui: Move NativeWindowTracker to its own directory https://chromium-review.googlesource.com/c/chromium/src/+/6646566 * fix: add missing includes * 6580522: [WAR, DNR] Fix unsafe redirect error to web accessible resource https://chromium-review.googlesource.com/c/chromium/src/+/6580522 * 6680477: Implement `completeCode` endpoint and expose to DevTools https://chromium-review.googlesource.com/c/chromium/src/+/6680477 * 6677511: [pepper] More pepper removal https://chromium-review.googlesource.com/c/chromium/src/+/6677511 * 6696689: Rename views::WidgetFocusManager -> NativeViewFocusManager https://chromium-review.googlesource.com/c/chromium/src/+/6696689 * 6702812: Move wtf/text/string_impl*.* to "blink" namespace https://chromium-review.googlesource.com/c/chromium/src/+/6702812 * chore: fix dialog patch * 6702431: [animation-trigger] Parse timeline-trigger-name https://chromium-review.googlesource.com/c/chromium/src/+/6702431 * chore: fixup patch indices * feat: replace webFrame.routingId with webFrame.frameToken * feat: WebFrameMain.prototype.frameToken * test: refactor to use replacement APIs * chore: fixup pip patch * test: adjust webFrame tests for frameToken changes * 6703757: Reland "Enable -fsanitize=array-bounds in non-UBSan builds" https://chromium-review.googlesource.com/c/chromium/src/+/6703757 * test: switch to frameTokens * test: routingId is fine to test in the main process * docs: add routingId to breaking changes * docs: update plugin-crashed event * chore: fixup linux dialog patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> (cherry picked from commit 603cafad7e) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com>
2026-04-10 03:01:51 -04:00 · 2025-07-15 12:05:29 -04:00
parent 96957aebf3
commit 2783f76f1f
174 changed files with 873 additions and 640 deletions
--- a/shell/common/api/electron_api_native_image.cc
+++ b/shell/common/api/electron_api_native_image.cc
@@ -606,7 +606,8 @@ const char* NativeImage::GetTypeName() {
 }

 // static
-gin::WrapperInfo NativeImage::kWrapperInfo = {gin::kEmbedderNativeGin};
+gin::DeprecatedWrapperInfo NativeImage::kWrapperInfo = {
+    gin::kEmbedderNativeGin};

 }  // namespace electron::api

--- a/shell/common/api/electron_api_native_image.h
+++ b/shell/common/api/electron_api_native_image.h
@@ -46,7 +46,7 @@ class ErrorThrower;

 namespace electron::api {

-class NativeImage final : public gin::Wrappable<NativeImage> {
+class NativeImage final : public gin::DeprecatedWrappable<NativeImage> {
 public:
  NativeImage(v8::Isolate* isolate, const gfx::Image& image);
 #if BUILDFLAG(IS_WIN)
@@ -96,7 +96,7 @@ class NativeImage final : public gin::Wrappable<NativeImage> {
      OnConvertError on_error = OnConvertError::kThrow);

  // gin::Wrappable
-  static gin::WrapperInfo kWrapperInfo;
+  static gin::DeprecatedWrapperInfo kWrapperInfo;
  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
      v8::Isolate* isolate) override;
  const char* GetTypeName() override;
--- a/shell/common/api/electron_api_url_loader.cc
+++ b/shell/common/api/electron_api_url_loader.cc
@@ -165,7 +165,7 @@ class BufferDataSource : public mojo::DataPipeProducer::DataSource {
 };

 class JSChunkedDataPipeGetter final
-    : public gin::Wrappable<JSChunkedDataPipeGetter>,
+    : public gin::DeprecatedWrappable<JSChunkedDataPipeGetter>,
      public network::mojom::ChunkedDataPipeGetter {
 public:
  static gin::Handle<JSChunkedDataPipeGetter> Create(
@@ -181,15 +181,15 @@ class JSChunkedDataPipeGetter final
  // gin::Wrappable
  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
      v8::Isolate* isolate) override {
-    return gin::Wrappable<JSChunkedDataPipeGetter>::GetObjectTemplateBuilder(
-               isolate)
+    return gin::DeprecatedWrappable<
+               JSChunkedDataPipeGetter>::GetObjectTemplateBuilder(isolate)
        .SetMethod("write", &JSChunkedDataPipeGetter::WriteChunk)
        .SetMethod("done", &JSChunkedDataPipeGetter::Done);
  }

  const char* GetTypeName() override { return "JSChunkedDataPipeGetter"; }

-  static gin::WrapperInfo kWrapperInfo;
+  static gin::DeprecatedWrapperInfo kWrapperInfo;
  ~JSChunkedDataPipeGetter() override = default;

 private:
@@ -298,7 +298,7 @@ class JSChunkedDataPipeGetter final
  v8::Global<v8::Function> body_func_;
 };

-gin::WrapperInfo JSChunkedDataPipeGetter::kWrapperInfo = {
+gin::DeprecatedWrapperInfo JSChunkedDataPipeGetter::kWrapperInfo = {
    gin::kEmbedderNativeGin};

 const net::NetworkTrafficAnnotationTag kTrafficAnnotation =
@@ -320,7 +320,7 @@ const net::NetworkTrafficAnnotationTag kTrafficAnnotation =

 }  // namespace

-gin::WrapperInfo SimpleURLLoaderWrapper::kWrapperInfo = {
+gin::DeprecatedWrapperInfo SimpleURLLoaderWrapper::kWrapperInfo = {
    gin::kEmbedderNativeGin};

 SimpleURLLoaderWrapper::SimpleURLLoaderWrapper(
--- a/shell/common/api/electron_api_url_loader.h
+++ b/shell/common/api/electron_api_url_loader.h
@@ -49,7 +49,7 @@ namespace electron::api {

 /** Wraps a SimpleURLLoader to make it usable from JavaScript */
 class SimpleURLLoaderWrapper final
-    : public gin::Wrappable<SimpleURLLoaderWrapper>,
+    : public gin::DeprecatedWrappable<SimpleURLLoaderWrapper>,
      public gin_helper::EventEmitterMixin<SimpleURLLoaderWrapper>,
      public gin_helper::CleanedUpAtExit,
      private network::SimpleURLLoaderStreamConsumer,
@@ -61,7 +61,7 @@ class SimpleURLLoaderWrapper final
  void Cancel();

  // gin::Wrappable
-  static gin::WrapperInfo kWrapperInfo;
+  static gin::DeprecatedWrapperInfo kWrapperInfo;
  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
      v8::Isolate* isolate) override;
  const char* GetTypeName() override;
--- a/shell/common/gin_converters/net_converter.cc
+++ b/shell/common/gin_converters/net_converter.cc
@@ -257,7 +257,7 @@ bool Converter<net::HttpRequestHeaders>::FromV8(v8::Isolate* isolate,
 namespace {

 class ChunkedDataPipeReadableStream final
-    : public gin::Wrappable<ChunkedDataPipeReadableStream> {
+    : public gin::DeprecatedWrappable<ChunkedDataPipeReadableStream> {
 public:
  static gin::Handle<ChunkedDataPipeReadableStream> Create(
      v8::Isolate* isolate,
@@ -270,14 +270,14 @@ class ChunkedDataPipeReadableStream final
  // gin::Wrappable
  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
      v8::Isolate* isolate) override {
-    return gin::Wrappable<
+    return gin::DeprecatedWrappable<
               ChunkedDataPipeReadableStream>::GetObjectTemplateBuilder(isolate)
        .SetMethod("read", &ChunkedDataPipeReadableStream::Read);
  }

  const char* GetTypeName() override { return "ChunkedDataPipeReadableStream"; }

-  static gin::WrapperInfo kWrapperInfo;
+  static gin::DeprecatedWrapperInfo kWrapperInfo;

 private:
  ChunkedDataPipeReadableStream(
@@ -495,7 +495,7 @@ class ChunkedDataPipeReadableStream final
  gin_helper::Promise<int> promise_;
 };

-gin::WrapperInfo ChunkedDataPipeReadableStream::kWrapperInfo = {
+gin::DeprecatedWrapperInfo ChunkedDataPipeReadableStream::kWrapperInfo = {
    gin::kEmbedderNativeGin};

 }  // namespace
--- a/shell/common/gin_helper/constructible.h
+++ b/shell/common/gin_helper/constructible.h
@@ -20,7 +20,7 @@ class EventEmitterMixin;
 // To use, inherit from gin::Wrappable and gin_helper::Constructible, and
 // define the static methods New and FillObjectTemplate:
 //
-//   class Example : public gin::Wrappable<Example>,
+//   class Example : public gin::DeprecatedWrappable<Example>,
 //                   public gin_helper::Constructible<Example> {
 //    public:
 //     static gin::Handle<Example> New(...usual gin method arguments...);
@@ -57,7 +57,8 @@ class Constructible {
          gin::kNumberOfInternalFields);
      constructor->SetClassName(gin::StringToV8(isolate, T::GetClassName()));
      T::FillObjectTemplate(isolate, constructor->PrototypeTemplate());
-      data->SetObjectTemplate(wrapper_info, constructor->InstanceTemplate());
+      data->DeprecatedSetObjectTemplate(wrapper_info,
+                                        constructor->InstanceTemplate());
      data->SetFunctionTemplate(wrapper_info, constructor);
    }
    return constructor->GetFunction(context).ToLocalChecked();
--- a/shell/common/gin_helper/event.cc
+++ b/shell/common/gin_helper/event.cc
@@ -27,7 +27,7 @@ Event::Event() = default;

 Event::~Event() = default;

-gin::WrapperInfo Event::kWrapperInfo = {gin::kEmbedderNativeGin};
+gin::DeprecatedWrapperInfo Event::kWrapperInfo = {gin::kEmbedderNativeGin};

 const char* Event::GetTypeName() {
  return GetClassName();
--- a/shell/common/gin_helper/event.h
+++ b/shell/common/gin_helper/event.h
@@ -23,7 +23,7 @@ class ObjectTemplate;

 namespace gin_helper::internal {

-class Event final : public gin::Wrappable<Event>,
+class Event final : public gin::DeprecatedWrappable<Event>,
                    public gin_helper::Constructible<Event> {
 public:
  // gin_helper::Constructible
@@ -34,7 +34,7 @@ class Event final : public gin::Wrappable<Event>,
  static const char* GetClassName() { return "Event"; }

  // gin::Wrappable
-  static gin::WrapperInfo kWrapperInfo;
+  static gin::DeprecatedWrapperInfo kWrapperInfo;
  const char* GetTypeName() override;

  ~Event() override;
--- a/shell/common/gin_helper/event_emitter_caller.h
+++ b/shell/common/gin_helper/event_emitter_caller.h
@@ -56,7 +56,7 @@ v8::Local<v8::Value> CustomEmit(v8::Isolate* isolate,

 template <typename T, typename... Args>
 v8::Local<v8::Value> CallMethod(v8::Isolate* isolate,
-                                gin::Wrappable<T>* object,
+                                gin::DeprecatedWrappable<T>* object,
                                const char* method_name,
                                Args&&... args) {
  v8::EscapableHandleScope scope(isolate);
@@ -69,7 +69,7 @@ v8::Local<v8::Value> CallMethod(v8::Isolate* isolate,
 }

 template <typename T, typename... Args>
-v8::Local<v8::Value> CallMethod(gin::Wrappable<T>* object,
+v8::Local<v8::Value> CallMethod(gin::DeprecatedWrappable<T>* object,
                                const char* method_name,
                                Args&&... args) {
  v8::Isolate* isolate = v8::Isolate::GetCurrent();
--- a/shell/common/gin_helper/event_emitter_template.cc
+++ b/shell/common/gin_helper/event_emitter_template.cc
@@ -12,7 +12,7 @@

 namespace gin_helper::internal {

-gin::WrapperInfo kWrapperInfo = {gin::kEmbedderNativeGin};
+gin::DeprecatedWrapperInfo kWrapperInfo = {gin::kEmbedderNativeGin};

 v8::Local<v8::FunctionTemplate> GetEventEmitterTemplate(v8::Isolate* isolate) {
  gin::PerIsolateData* data = gin::PerIsolateData::From(isolate);
--- a/shell/common/gin_helper/reply_channel.cc
+++ b/shell/common/gin_helper/reply_channel.cc
@@ -22,7 +22,8 @@ gin::Handle<ReplyChannel> ReplyChannel::Create(v8::Isolate* isolate,

 gin::ObjectTemplateBuilder ReplyChannel::GetObjectTemplateBuilder(
    v8::Isolate* isolate) {
-  return gin::Wrappable<ReplyChannel>::GetObjectTemplateBuilder(isolate)
+  return gin::DeprecatedWrappable<ReplyChannel>::GetObjectTemplateBuilder(
+             isolate)
      .SetMethod("sendReply", &ReplyChannel::SendReply);
 }

@@ -61,6 +62,7 @@ bool ReplyChannel::SendReply(v8::Isolate* isolate, v8::Local<v8::Value> arg) {
  return true;
 }

-gin::WrapperInfo ReplyChannel::kWrapperInfo = {gin::kEmbedderNativeGin};
+gin::DeprecatedWrapperInfo ReplyChannel::kWrapperInfo = {
+    gin::kEmbedderNativeGin};

 }  // namespace gin_helper::internal
--- a/shell/common/gin_helper/reply_channel.h
+++ b/shell/common/gin_helper/reply_channel.h
@@ -26,14 +26,14 @@ namespace gin_helper::internal {
 // This object wraps the InvokeCallback so that if it gets GC'd by V8, we can
 // still call the callback and send an error. Not doing so causes a Mojo DCHECK,
 // since Mojo requires callbacks to be called before they are destroyed.
-class ReplyChannel : public gin::Wrappable<ReplyChannel> {
+class ReplyChannel : public gin::DeprecatedWrappable<ReplyChannel> {
 public:
  using InvokeCallback = electron::mojom::ElectronApiIPC::InvokeCallback;
  static gin::Handle<ReplyChannel> Create(v8::Isolate* isolate,
                                          InvokeCallback callback);

  // gin::Wrappable
-  static gin::WrapperInfo kWrapperInfo;
+  static gin::DeprecatedWrapperInfo kWrapperInfo;
  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
      v8::Isolate* isolate) override;
  const char* GetTypeName() override;
--- a/shell/common/gin_helper/wrappable.cc
+++ b/shell/common/gin_helper/wrappable.cc
@@ -11,7 +11,7 @@
 namespace gin_helper {

 bool IsValidWrappable(const v8::Local<v8::Value>& val,
-                      const gin::WrapperInfo* wrapper_info) {
+                      const gin::DeprecatedWrapperInfo* wrapper_info) {
  if (!val->IsObject())
    return false;

@@ -19,8 +19,9 @@ bool IsValidWrappable(const v8::Local<v8::Value>& val,
  if (port->InternalFieldCount() != gin::kNumberOfInternalFields)
    return false;

-  const gin::WrapperInfo* info = static_cast<gin::WrapperInfo*>(
-      port->GetAlignedPointerFromInternalField(gin::kWrapperInfoIndex));
+  const gin::DeprecatedWrapperInfo* info =
+      static_cast<gin::DeprecatedWrapperInfo*>(
+          port->GetAlignedPointerFromInternalField(gin::kWrapperInfoIndex));
  if (info != wrapper_info)
    return false;

--- a/shell/common/gin_helper/wrappable.h
+++ b/shell/common/gin_helper/wrappable.h
@@ -12,7 +12,7 @@
 namespace gin_helper {

 bool IsValidWrappable(const v8::Local<v8::Value>& obj,
-                      const gin::WrapperInfo* wrapper_info);
+                      const gin::DeprecatedWrapperInfo* wrapper_info);

 namespace internal {

@@ -69,12 +69,13 @@ class Wrappable : public WrappableBase {
  }

 private:
-  static gin::WrapperInfo kWrapperInfo;
+  static gin::DeprecatedWrapperInfo kWrapperInfo;
 };

 // static
 template <typename T>
-gin::WrapperInfo Wrappable<T>::kWrapperInfo = {gin::kEmbedderNativeGin};
+gin::DeprecatedWrapperInfo Wrappable<T>::kWrapperInfo = {
+    gin::kEmbedderNativeGin};

 }  // namespace gin_helper