chore: bump chromium to 85.0.4181.1 (10-x-y) (#23987)

* chore: bump chromium in DEPS to 85.0.4165.1 * chore: bump chromium in DEPS to 85.0.4166.1 * chore: bump chromium in DEPS to 85.0.4166.2 * chore: bump chromium in DEPS to 85.0.4166.3 * update patches * fixup! Revert "[printing] Mojofy PrintHostMsg_CheckForCancel" (cherry picked from commit 2cc1caf5d7d716ceefb23d5228a79544a2e91206) * update patches * Revert "[printing] Mojofy PrintHostMsg_CheckForCancel" (cherry picked from commit c2b389957836ad77eb8e977872e6a8590666f3da) * Remove WebImeTextSpan https://chromium-review.googlesource.com/c/chromium/src/+/2225240 (cherry picked from commit d839261d71b156c972d3878f16f971e6b6d98f45) * Remove PDFAnnotations flag altogether. https://chromium-review.googlesource.com/c/chromium/src/+/2229317 (cherry picked from commit 50384ed12602d4a9da3209eacfca4faae78f9986) * Rework find-from-selection so it's synchronous -- fixes flaky tests https://chromium-review.googlesource.com/c/chromium/src/+/2181570 (cherry picked from commit 3e9241560390fb18969393beda425afc63f5a151) * Use ExtensionSystem::is_ready() instead of ExtensionService::is_ready() https://chromium-review.googlesource.com/c/chromium/src/+/2207499 (cherry picked from commit 2424589454a9a2ef9cc89c232b4ee87b0bf400cc) * update sysroots (cherry picked from commit b5ea653e602152dde00303d1cfb915d4df320983) * chore: bump chromium in DEPS to 85.0.4167.1 * Take RFH as a parameter for DidUpdateFavicon/ManifestURL https://chromium-review.googlesource.com/c/chromium/src/+/2224745 (cherry picked from commit ad40668221732e28bcc8b9b270ab4686c42e956a) * update patches * update patches * Rename net::cookie_util::StripStatuses to StripAccessResults https://chromium-review.googlesource.com/c/chromium/src/+/2212697 (cherry picked from commit bf3de1fe1cbb17feb46b40c81f0eb13b1e7b6412) * use net::CookieAccessResultList instead of net::CookieAccessResultList (cherry picked from commit 400da79504da2310b7c1177b4b3f9f83a3f2b305) * chore: bump chromium in DEPS to 85.0.4168.1 * fix mas_no_private_api patch https://chromium-review.googlesource.com/c/chromium/src/+/2230281 (cherry picked from commit 9b127147e0ba7ef1d4454099effe49327b1a5ab6) * Update patches * fix: add new navigation state REUSE_SITE_INSTANCE To fix the new set of state checks added in https://chromium-review.googlesource.com/c/chromium/src/+/2215141 (cherry picked from commit 3a91b684efdc7742e7c5efa65263f80e8a24ec4a) * chore: bump chromium in DEPS to 85.0.4169.1 * update patches * chore: bump chromium in DEPS to 85.0.4170.1 * chore: bump chromium in DEPS to 85.0.4171.1 * chore: bump chromium in DEPS to 85.0.4172.1 * chore: bump chromium in DEPS to 85.0.4173.1 * chore: bump chromium in DEPS to 85.0.4174.1 * chore: bump chromium in DEPS to 85.0.4175.3 * chore: bump chromium in DEPS to 85.0.4176.1 * chore: bump chromium in DEPS to 85.0.4177.2 * chore: bump chromium in DEPS to 85.0.4178.1 * chore: bump chromium in DEPS to 85.0.4178.3 * refactor: MessageLoop, you are terminated \o/ Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2246173 (cherry picked from commit 0368131d60) * chore: bump chromium in DEPS to 85.0.4178.4 * update patches * update lib_src_switch_buffer_kmaxlength_to_size_t.patch (cherry picked from commit c5efbdd166) * [v8] Allow for 4GB TypedArrays https: //chromium-review.googlesource.com/c/v8/v8/+/2249668 (cherry picked from commit 2c1d6bfd9d) Co-Authored-By: Robo <hop2deep@gmail.com> * Cleanup usages of old mojo types and remove unused code https://chromium-review.googlesource.com/c/chromium/src/+/2235699 (cherry picked from commit e89cb21e8e) * refactor: plumb DownloadSchedule to DownloadItem Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2242202 (cherry picked from commit 4d549ae2b0) * chore: fix variable typo in IPC (cherry picked from commit 7251b1e6c5) * chore: s/BindPipeAndPassReceiver/BindNewPipeAndPassReceiver (cherry picked from commit e89bd6c639) * chore: XEvent becomes x11::Event Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2240355 (cherry picked from commit 4d832da740) * fixup! refactor: MessageLoop, you are terminated \o/ (cherry picked from commit 902d72d740) * fixup! chore: XEvent becomes x11::Event (cherry picked from commit 27043549f3) * chore: fix windows build (cherry picked from commit 4977098eb3) * chore: disable SameSite-by-default changes https://chromium-review.googlesource.com/c/chromium/src/+/2231445 (cherry picked from commit d8318aafff) * update printing.patch (cherry picked from commit e2037f527f) * Convert WidgetHostMsg_SelectionBoundsChanged/TextInputStateChanged https://chromium-review.googlesource.com/c/chromium/src/+/2243531 (cherry picked from commit 60ff2e067d) * [XProto] Replace usages of XID and ::Window with x11::Window https://chromium-review.googlesource.com/c/chromium/src/+/2249389 (cherry picked from commit 97f5b59e06) * Update VideoFrameMetadata to use base::Optionals https://chromium-review.googlesource.com/c/chromium/src/+/2231706 https://chromium-review.googlesource.com/c/chromium/src/+/2238361 (cherry picked from commit 4787e1f541) * --disable-dev-shm-usage for gpu process crash (cherry picked from commit 207d8a380a) * update patches * fixup: Cleanup usages of old mojo types and remove unused code * update patches * chore: bump chromium in DEPS to 85.0.4180.1 * build: update v8 headers (cherry picked from commit 4808975f75) * Update patches * fixup: build: update v8 headers * Fixup ssl_security_state_tab_helper.patch * Add missing headers * Adds icon loading service with sandbox for Windows. https://chromium-review.googlesource.com/c/chromium/src/+/1987273 * disable app.getGPUInfo spec on linux (cherry picked from commit b7ea16c4b7) * Add missing headers for Linux and Windows * Fixup Adds icon loading service with sandbox for Windows * chore: bump chromium in DEPS to 85.0.4181.1 * update patches * Fixup: (for real) Adds icon loading service with sandbox for Windows * No more Vulkan info collection for UMA on Windows https://chromium-review.googlesource.com/c/chromium/src/+/2252818 * extensions: Rename SharedUserScriptMaster to SharedUserScriptManager https://chromium-review.googlesource.com/c/chromium/src/+/2258357 * Add missing headers * fixup: extensions: Rename SharedUserScriptMaster to SharedUserScriptManager * fixup: No more Vulkan info collection for UMA on Windows * Add missing header * Add resource for IDS_UTILITY_PROCESS_UTILITY_WIN_NAME * fix build on windows * fix gn check Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
2026-04-10 03:01:51 -04:00 · 2020-06-25 00:48:48 -07:00
parent 86e4a96f45
commit 19e7af9841
129 changed files with 1116 additions and 703 deletions
--- a/shell/renderer/api/electron_api_ipc_renderer.cc
+++ b/shell/renderer/api/electron_api_ipc_renderer.cc
@@ -59,16 +59,16 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
    weak_context_.SetWeak();

    render_frame->GetRemoteInterfaces()->GetInterface(
-        mojo::MakeRequest(&electron_browser_ptr_));
+        electron_browser_remote_.BindNewPipeAndPassReceiver());
  }

-  void OnDestruct() override { electron_browser_ptr_.reset(); }
+  void OnDestruct() override { electron_browser_remote_.reset(); }

  void WillReleaseScriptContext(v8::Local<v8::Context> context,
                                int32_t world_id) override {
    if (weak_context_.IsEmpty() ||
        weak_context_.Get(context->GetIsolate()) == context)
-      electron_browser_ptr_.reset();
+      electron_browser_remote_.reset();
  }

  // gin::Wrappable:
@@ -91,7 +91,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
                   bool internal,
                   const std::string& channel,
                   v8::Local<v8::Value> arguments) {
-    if (!electron_browser_ptr_) {
+    if (!electron_browser_remote_) {
      thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
      return;
    }
@@ -99,7 +99,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
    if (!electron::SerializeV8Value(isolate, arguments, &message)) {
      return;
    }
-    electron_browser_ptr_->Message(internal, channel, std::move(message));
+    electron_browser_remote_->Message(internal, channel, std::move(message));
  }

  v8::Local<v8::Promise> Invoke(v8::Isolate* isolate,
@@ -107,7 +107,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
                                bool internal,
                                const std::string& channel,
                                v8::Local<v8::Value> arguments) {
-    if (!electron_browser_ptr_) {
+    if (!electron_browser_remote_) {
      thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
      return v8::Local<v8::Promise>();
    }
@@ -118,7 +118,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
    gin_helper::Promise<blink::CloneableMessage> p(isolate);
    auto handle = p.GetHandle();

-    electron_browser_ptr_->Invoke(
+    electron_browser_remote_->Invoke(
        internal, channel, std::move(message),
        base::BindOnce(
            [](gin_helper::Promise<blink::CloneableMessage> p,
@@ -133,7 +133,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
                   const std::string& channel,
                   v8::Local<v8::Value> message_value,
                   base::Optional<v8::Local<v8::Value>> transfer) {
-    if (!electron_browser_ptr_) {
+    if (!electron_browser_remote_) {
      thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
      return;
    }
@@ -165,8 +165,8 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
    }

    transferable_message.ports = std::move(ports);
-    electron_browser_ptr_->ReceivePostMessage(channel,
-                                              std::move(transferable_message));
+    electron_browser_remote_->ReceivePostMessage(
+        channel, std::move(transferable_message));
  }

  void SendTo(v8::Isolate* isolate,
@@ -176,7 +176,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
              int32_t web_contents_id,
              const std::string& channel,
              v8::Local<v8::Value> arguments) {
-    if (!electron_browser_ptr_) {
+    if (!electron_browser_remote_) {
      thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
      return;
    }
@@ -184,15 +184,15 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
    if (!electron::SerializeV8Value(isolate, arguments, &message)) {
      return;
    }
-    electron_browser_ptr_->MessageTo(internal, send_to_all, web_contents_id,
-                                     channel, std::move(message));
+    electron_browser_remote_->MessageTo(internal, send_to_all, web_contents_id,
+                                        channel, std::move(message));
  }

  void SendToHost(v8::Isolate* isolate,
                  gin_helper::ErrorThrower thrower,
                  const std::string& channel,
                  v8::Local<v8::Value> arguments) {
-    if (!electron_browser_ptr_) {
+    if (!electron_browser_remote_) {
      thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
      return;
    }
@@ -200,7 +200,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
    if (!electron::SerializeV8Value(isolate, arguments, &message)) {
      return;
    }
-    electron_browser_ptr_->MessageHost(channel, std::move(message));
+    electron_browser_remote_->MessageHost(channel, std::move(message));
  }

  v8::Local<v8::Value> SendSync(v8::Isolate* isolate,
@@ -208,7 +208,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
                                bool internal,
                                const std::string& channel,
                                v8::Local<v8::Value> arguments) {
-    if (!electron_browser_ptr_) {
+    if (!electron_browser_remote_) {
      thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
      return v8::Local<v8::Value>();
    }
@@ -218,13 +218,13 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
    }

    blink::CloneableMessage result;
-    electron_browser_ptr_->MessageSync(internal, channel, std::move(message),
-                                       &result);
+    electron_browser_remote_->MessageSync(internal, channel, std::move(message),
+                                          &result);
    return electron::DeserializeV8Value(isolate, result);
  }

  v8::Global<v8::Context> weak_context_;
-  electron::mojom::ElectronBrowserPtr electron_browser_ptr_;
+  mojo::Remote<electron::mojom::ElectronBrowser> electron_browser_remote_;
 };

 gin::WrapperInfo IPCRenderer::kWrapperInfo = {gin::kEmbedderNativeGin};
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -30,12 +30,12 @@
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_element.h"
 #include "third_party/blink/public/web/web_frame_widget.h"
-#include "third_party/blink/public/web/web_ime_text_span.h"
 #include "third_party/blink/public/web/web_input_method_controller.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_script_execution_callback.h"
 #include "third_party/blink/public/web/web_script_source.h"
 #include "third_party/blink/public/web/web_view.h"
+#include "ui/base/ime/ime_text_span.h"
 #include "url/url_util.h"

 namespace gin {
@@ -270,10 +270,10 @@ void SetZoomLevel(gin_helper::ErrorThrower thrower,
    return;
  }

-  mojom::ElectronBrowserPtr browser_ptr;
+  mojo::Remote<mojom::ElectronBrowser> browser_remote;
  render_frame->GetRemoteInterfaces()->GetInterface(
-      mojo::MakeRequest(&browser_ptr));
-  browser_ptr->SetTemporaryZoomLevel(level);
+      browser_remote.BindNewPipeAndPassReceiver());
+  browser_remote->SetTemporaryZoomLevel(level);
 }

 double GetZoomLevel(gin_helper::ErrorThrower thrower,
@@ -287,10 +287,10 @@ double GetZoomLevel(gin_helper::ErrorThrower thrower,
    return result;
  }

-  mojom::ElectronBrowserPtr browser_ptr;
+  mojo::Remote<mojom::ElectronBrowser> browser_remote;
  render_frame->GetRemoteInterfaces()->GetInterface(
-      mojo::MakeRequest(&browser_ptr));
-  browser_ptr->DoGetZoomLevel(&result);
+      browser_remote.BindNewPipeAndPassReceiver());
+  browser_remote->DoGetZoomLevel(&result);
  return result;
 }

@@ -420,8 +420,7 @@ void InsertText(gin_helper::ErrorThrower thrower,
        ->FrameWidget()
        ->GetActiveWebInputMethodController()
        ->CommitText(blink::WebString::FromUTF8(text),
-                     blink::WebVector<blink::WebImeTextSpan>(),
-                     blink::WebRange(), 0);
+                     blink::WebVector<ui::ImeTextSpan>(), blink::WebRange(), 0);
  }
 }