chore: bump chromium to 104.0.5112.39 (20-x-y) (#34425)

* chore: bump chromium in DEPS to 104.0.5098.0 * chore: bump chromium in DEPS to 104.0.5100.0 * chore: bump chromium in DEPS to 104.0.5102.0 * chore: bump chromium in DEPS to 104.0.5103.0 * chore: bump chromium in DEPS to 104.0.5104.0 * chore: bump chromium in DEPS to 104.0.5106.0 * chore: bump chromium in DEPS to 104.0.5108.0 * chore: bump chromium in DEPS to 104.0.5110.0 * chore: bump chromium in DEPS to 104.0.5112.0 * chore: bump chromium in DEPS to 104.0.5112.4 * 3651284: Use the entry settings object for window.open navigation https://chromium-review.googlesource.com/c/chromium/src/+/3651284 (cherry picked from commit 6ff37a08f7) * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 (cherry picked from commit 46df809556) * 3642842: Window Placement: Prototype Fullscreen Capability Delegation - Part 2 https://chromium-review.googlesource.com/c/chromium/src/+/3642842 (cherry picked from commit 2fe1bc3222) * 3652785: [sandbox] Enable sandboxed pointers on sanitizer builds https://chromium-review.googlesource.com/c/v8/v8/+/3652785 (cherry picked from commit ca8a3852f4) * 3611967: webhid: Migrate HidDelegate to use BrowserContext and Origin https://chromium-review.googlesource.com/c/chromium/src/+/3611967 (cherry picked from commit 18aac8e93e) * 3665762: Remove RenderFrameHost::IsRenderFrameCreated from //content/. https://chromium-review.googlesource.com/c/chromium/src/+/3665762 (cherry picked from commit 070ea1700b) * 3659375: Fold x509_util_ios and most of x509_util_mac into x509_util_apple https://chromium-review.googlesource.com/c/chromium/src/+/3659375 (cherry picked from commit 479647e0ac) * 3656234: [CodeHealth] Remove uses of base::ListValue::Append() (Final, take 2) https://chromium-review.googlesource.com/c/chromium/src/+/3656234 (cherry picked from commit e15d6110ed) * chore: update patch indices (cherry picked from commit 8d666da975) * chore: fix lint (cherry picked from commit f9a9aca456) * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 (cherry picked from commit 014c4b9212) * webhid: Migrate HidDelegate to use BrowserContext and Origin This is a temporary fix for https://chromium-review.googlesource.com/c/chromium/src/+/3611967 to get the build compiling, but we need to either patch around https://chromium-review.googlesource.com/c/chromium/src/+/3611967 or move our device permissioning to BrowserContext (cherry picked from commit 322e9686da) * chore: fix lint (cherry picked from commit 12b886cc62) * build: run electron/script/gen-libc++-filenames.js fixes gn check (cherry picked from commit 93cebfecb2) * chore: disable flaking tests (cherry picked from commit fd0bc08f44) * 3652749: Delete GLRenderer and related classes https://chromium-review.googlesource.com/c/chromium/src/+/3652749 (cherry picked from commit 43024a74c2) * 3682394: Change pipes surrounding code references in comments to backticks https://chromium-review.googlesource.com/c/chromium/src/+/3682394 (cherry picked from commit 41026ae4d0) * chore: fixup patch indices (cherry picked from commit fccfc1bb29) * 3671199: Remove ContentMainDelegate::PostFieldTrialInitialization https://chromium-review.googlesource.com/c/chromium/src/+/3671199 (cherry picked from commit 6392cfb595) * 3607963: hid: Do not exclude HID device with no collections https://chromium-review.googlesource.com/c/chromium/src/+/3607963 (cherry picked from commit 2d81975792) * refactor: use ElectronBrowserContext instead of WebContents to persist devices due to changes like https://chromium-review.googlesource.com/c/chromium/src/+/3611967, we can no longer use WebContents to store device permissions so this commit moves device permission storage to live in memory in ElectronBrowserContext instead. (cherry picked from commit 2f95568bfd) * 3557253: Deprecate some signature checks https://chromium-review.googlesource.com/c/v8/v8/+/3557253 (cherry picked from commit da4f0dbd1b) * 3680781: Add policy for Renderer App Container. https://chromium-review.googlesource.com/c/chromium/src/+/3680781 (cherry picked from commit cb901ce489) * chore: update patch indices (cherry picked from commit 40c6295a5b) * 3675465: Update NetLog network service API to use mojom::DictionaryValue. https://chromium-review.googlesource.com/c/chromium/src/+/3675465 (cherry picked from commit 55a58418e6) * fix: add patch for DCHECK in fullscreen test (cherry picked from commit c65280306d) * build: fix nan build (cherry picked from commit c06ea18698) * build: make the nan spec runner work on macOS (cherry picked from commit a22950b126) * chore: update patches (cherry picked from commit 7375148f93) * chore: update patches * 3693745: Delete base::LowerCaseEqualsASCII() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3693745 (cherry picked from commit ed192f5c9b) * 3653285: Remove OS X 10.11 and macOS 10.12 code from chrome/ https://chromium-review.googlesource.com/c/chromium/src/+/3653285 * 3687395: Remove DictionaryValue::HasKey(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3687395 (cherry picked from commit 2a6804db60) * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 (cherry picked from commit fca99a5cf9) * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. https://chromium-review.googlesource.com/c/chromium/src/+/3560567 * 3684873: [Bluetooth][Win/Linux] Add bluetooth pair confirmation prompt https://chromium-review.googlesource.com/c/chromium/src/+/3684873 * chore: missing includes in desktop_notification_controller (cherry picked from commit 574fb7933d) * 3685951: Reland "Make sure screen object is created once in tests." https://chromium-review.googlesource.com/c/chromium/src/+/3685951 * fixup: Reland "Make sure screen object is created once in tests." * chore: bump chromium in DEPS to 104.0.5110.0 * chore: update patches * Revert "3560567: [MSC] Porting GenerateStreams clients to handle stream vectors." This reverts commit c9c1c534056404be22a2d81ae6df4d184654fa35. * Revert "3691014: Prevent unsafe narrowing: ui/accessibility, part 2" This reverts commit 08f7a35765fde0467ef44d773e943cf5998619ae. * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 * fixup: 3687671: [v8] Freeze flags after initialization * chore: bump chromium in DEPS to 104.0.5112.14 * chore: update patches * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 (cherry picked from commit fca99a5cf9) (cherry picked from commit 08f7a35765fde0467ef44d773e943cf5998619ae) * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. https://chromium-review.googlesource.com/c/chromium/src/+/3560567 (cherry picked from commit c9c1c534056404be22a2d81ae6df4d184654fa35) * 3669226: Remove printing PostTask usage of IO thread https://chromium-review.googlesource.com/c/chromium/src/+/3669226 * chore: document breaking change (cherry picked from commit d0991597c2) * chore: update patches * chore: remove deprecated AccessorSignatures https://github.com/nodejs/nan/pull/941 * Revert "fixup: 3687671: [v8] Freeze flags after initialization" This reverts commit a473727f39267327c7a77ec5056edd36b7c5b403. * Revert "3687671: [v8] Freeze flags after initialization" This reverts commit 7a8404be3c9d48a2e7ce877d749362f4754a9f17. * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 (cherry picked from commit f4c53302ea) * 52026: Do not allow md4 or md5 based signatures in X.509 certificates. https://boringssl-review.googlesource.com/c/boringssl/+/52026 * chore: bump chromium in DEPS to 104.0.5112.20 * chore: update patches patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch is no longer needed because it was upstreamed via: 2527943: Allow static access to WasmCodeGeneration callback https://chromium-review.googlesource.com/c/chromium/src/+/2527943 * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560567 (cherry picked from commit 797c3a1656) * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. (cherry picked from commit 9741ab73cf) * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. (cherry picked from commit 558ed59d86) * chore: bump chromium in DEPS to 104.0.5112.29 * chore: update patches * chore: bump chromium in DEPS to 104.0.5112.39 * chore: update patches * chore: update patches * Trigger Build * 3695382: [ext-code-space] Fix CodeRange allocation logic https://chromium-review.googlesource.com/c/v8/v8/+/3695382 fixes https://bugs.chromium.org/p/v8/issues/detail?id=12942 * 3695382: [ext-code-space] Fix CodeRange allocation logic https://chromium-review.googlesource.com/c/v8/v8/+/3695382 * chore: update patches Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
2026-04-10 03:01:51 -04:00 · 2022-07-12 08:22:53 -04:00
parent 3ca5708faa
commit db0830e0f8
124 changed files with 1346 additions and 1084 deletions
--- a/shell/browser/api/electron_api_net_log.cc
+++ b/shell/browser/api/electron_api_net_log.cc
@@ -132,9 +132,8 @@ v8::Local<v8::Promise> NetLog::StartLogging(base::FilePath log_path,
  auto command_line_string =
      base::CommandLine::ForCurrentProcess()->GetCommandLineString();
  auto channel_string = std::string("Electron " ELECTRON_VERSION);
-  base::Value custom_constants =
-      base::Value::FromUniquePtrValue(net_log::GetPlatformConstantsForNetLog(
-          command_line_string, channel_string));
+  base::Value::Dict custom_constants = net_log::GetPlatformConstantsForNetLog(
+      command_line_string, channel_string);

  auto* network_context =
      browser_context_->GetDefaultStoragePartition()->GetNetworkContext();
@@ -156,7 +155,7 @@ v8::Local<v8::Promise> NetLog::StartLogging(base::FilePath log_path,

 void NetLog::StartNetLogAfterCreateFile(net::NetLogCaptureMode capture_mode,
                                        uint64_t max_file_size,
-                                        base::Value custom_constants,
+                                        base::Value::Dict custom_constants,
                                        base::File output_file) {
  if (!net_log_exporter_) {
    // Theoretically the mojo pipe could have been closed by the time we get
@@ -204,7 +203,7 @@ v8::Local<v8::Promise> NetLog::StopLogging(gin::Arguments* args) {
    // pointer lives long enough to resolve the promise. Moving it into the
    // callback will cause the instance variable to become empty.
    net_log_exporter_->Stop(
-        base::Value(base::Value::Type::DICTIONARY),
+        base::Value::Dict(),
        base::BindOnce(
            [](mojo::Remote<network::mojom::NetLogExporter>,
               gin_helper::Promise<void> promise, int32_t error) {
--- a/shell/browser/api/electron_api_net_log.h
+++ b/shell/browser/api/electron_api_net_log.h
@@ -57,7 +57,7 @@ class NetLog : public gin::Wrappable<NetLog> {

  void StartNetLogAfterCreateFile(net::NetLogCaptureMode capture_mode,
                                  uint64_t max_file_size,
-                                  base::Value custom_constants,
+                                  base::Value::Dict custom_constants,
                                  base::File output_file);
  void NetLogStarted(int32_t error);

--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -945,12 +945,6 @@ void WebContents::InitWithWebContents(
 }

 WebContents::~WebContents() {
-  // clear out objects that have been granted permissions so that when
-  // WebContents::RenderFrameDeleted is called as a result of WebContents
-  // destruction it doesn't try to clear out a granted_devices_
-  // on a destructed object.
-  granted_devices_.clear();
-
  if (!inspectable_web_contents_) {
    WebContentsDestroyed();
    return;
@@ -1558,11 +1552,6 @@ void WebContents::RenderFrameDeleted(
  //   is swapped by content::RenderFrameHostManager.
  //

-  // clear out objects that have been granted permissions
-  if (!granted_devices_.empty()) {
-    granted_devices_.erase(render_frame_host->GetFrameTreeNodeId());
-  }
-
  // WebFrameMain::FromRenderFrameHost(rfh) will use the RFH's FrameTreeNode ID
  // to find an existing instance of WebFrameMain. During a cross-origin
  // navigation, the deleted RFH will be the old host which was swapped out. In
@@ -3421,7 +3410,7 @@ v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
    return handle;
  }

-  if (!frame_host->IsRenderFrameCreated()) {
+  if (!frame_host->IsRenderFrameLive()) {
    promise.RejectWithErrorMessage("takeHeapSnapshot failed");
    return handle;
  }
@@ -3449,132 +3438,6 @@ v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
  return handle;
 }

-void WebContents::GrantDevicePermission(
-    const url::Origin& origin,
-    const base::Value* device,
-    blink::PermissionType permission_type,
-    content::RenderFrameHost* render_frame_host) {
-  granted_devices_[render_frame_host->GetFrameTreeNodeId()][permission_type]
-                  [origin]
-                      .push_back(
-                          std::make_unique<base::Value>(device->Clone()));
-}
-
-void WebContents::RevokeDevicePermission(
-    const url::Origin& origin,
-    const base::Value* device,
-    blink::PermissionType permission_type,
-    content::RenderFrameHost* render_frame_host) {
-  const auto& devices_for_frame_host_it =
-      granted_devices_.find(render_frame_host->GetFrameTreeNodeId());
-  if (devices_for_frame_host_it == granted_devices_.end())
-    return;
-
-  const auto& current_devices_it =
-      devices_for_frame_host_it->second.find(permission_type);
-  if (current_devices_it == devices_for_frame_host_it->second.end())
-    return;
-
-  const auto& origin_devices_it = current_devices_it->second.find(origin);
-  if (origin_devices_it == current_devices_it->second.end())
-    return;
-
-  for (auto it = origin_devices_it->second.begin();
-       it != origin_devices_it->second.end();) {
-    if (DoesDeviceMatch(device, it->get(), permission_type)) {
-      it = origin_devices_it->second.erase(it);
-    } else {
-      ++it;
-    }
-  }
-}
-
-bool WebContents::DoesDeviceMatch(const base::Value* device,
-                                  const base::Value* device_to_compare,
-                                  blink::PermissionType permission_type) {
-  if (permission_type ==
-      static_cast<blink::PermissionType>(
-          WebContentsPermissionHelper::PermissionType::HID)) {
-    if (device->GetDict().FindInt(kHidVendorIdKey) !=
-            device_to_compare->GetDict().FindInt(kHidVendorIdKey) ||
-        device->GetDict().FindInt(kHidProductIdKey) !=
-            device_to_compare->GetDict().FindInt(kHidProductIdKey)) {
-      return false;
-    }
-
-    const auto* serial_number =
-        device_to_compare->GetDict().FindString(kHidSerialNumberKey);
-    const auto* device_serial_number =
-        device->GetDict().FindString(kHidSerialNumberKey);
-
-    if (serial_number && device_serial_number &&
-        *device_serial_number == *serial_number)
-      return true;
-  } else if (permission_type ==
-             static_cast<blink::PermissionType>(
-                 WebContentsPermissionHelper::PermissionType::SERIAL)) {
-#if BUILDFLAG(IS_WIN)
-    const auto* instance_id =
-        device->GetDict().FindString(kDeviceInstanceIdKey);
-    const auto* port_instance_id =
-        device_to_compare->GetDict().FindString(kDeviceInstanceIdKey);
-    if (instance_id && port_instance_id && *instance_id == *port_instance_id)
-      return true;
-#else
-    const auto* serial_number = device->GetDict().FindString(kSerialNumberKey);
-    const auto* port_serial_number =
-        device_to_compare->GetDict().FindString(kSerialNumberKey);
-    if (device->GetDict().FindInt(kVendorIdKey) !=
-            device_to_compare->GetDict().FindInt(kVendorIdKey) ||
-        device->GetDict().FindInt(kProductIdKey) !=
-            device_to_compare->GetDict().FindInt(kProductIdKey) ||
-        (serial_number && port_serial_number &&
-         *port_serial_number != *serial_number)) {
-      return false;
-    }
-
-#if BUILDFLAG(IS_MAC)
-    const auto* usb_driver_key = device->GetDict().FindString(kUsbDriverKey);
-    const auto* port_usb_driver_key =
-        device_to_compare->GetDict().FindString(kUsbDriverKey);
-    if (usb_driver_key && port_usb_driver_key &&
-        *usb_driver_key != *port_usb_driver_key) {
-      return false;
-    }
-#endif  // BUILDFLAG(IS_MAC)
-    return true;
-#endif  // BUILDFLAG(IS_WIN)
-  }
-  return false;
-}
-
-bool WebContents::CheckDevicePermission(
-    const url::Origin& origin,
-    const base::Value* device,
-    blink::PermissionType permission_type,
-    content::RenderFrameHost* render_frame_host) {
-  const auto& devices_for_frame_host_it =
-      granted_devices_.find(render_frame_host->GetFrameTreeNodeId());
-  if (devices_for_frame_host_it == granted_devices_.end())
-    return false;
-
-  const auto& current_devices_it =
-      devices_for_frame_host_it->second.find(permission_type);
-  if (current_devices_it == devices_for_frame_host_it->second.end())
-    return false;
-
-  const auto& origin_devices_it = current_devices_it->second.find(origin);
-  if (origin_devices_it == current_devices_it->second.end())
-    return false;
-
-  for (const auto& device_to_compare : origin_devices_it->second) {
-    if (DoesDeviceMatch(device, device_to_compare.get(), permission_type))
-      return true;
-  }
-
-  return false;
-}
-
 void WebContents::UpdatePreferredSize(content::WebContents* web_contents,
                                      const gfx::Size& pref_size) {
  Emit("preferred-size-changed", pref_size);
@@ -3712,7 +3575,8 @@ void WebContents::DevToolsRequestFileSystems() {

  base::ListValue file_system_value;
  for (const auto& file_system : file_systems)
-    file_system_value.Append(CreateFileSystemValue(file_system));
+    file_system_value.Append(
+        base::Value::FromUniquePtrValue(CreateFileSystemValue(file_system)));
  inspectable_web_contents_->CallClientFunction(
      "DevToolsAPI.fileSystemsLoaded", &file_system_value, nullptr, nullptr);
 }
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -42,7 +42,6 @@
 #include "shell/common/gin_helper/constructible.h"
 #include "shell/common/gin_helper/error_thrower.h"
 #include "shell/common/gin_helper/pinnable.h"
-#include "third_party/blink/public/common/permissions/permission_utils.h"
 #include "ui/base/models/image_model.h"
 #include "ui/gfx/image/image.h"

@@ -96,11 +95,6 @@ class OffScreenWebContentsView;

 namespace api {

-using DevicePermissionMap = std::map<
-    int,
-    std::map<blink::PermissionType,
-             std::map<url::Origin, std::vector<std::unique_ptr<base::Value>>>>>;
-
 // Wrapper around the content::WebContents.
 class WebContents : public ExclusiveAccessContext,
                    public gin::Wrappable<WebContents>,
@@ -436,28 +430,6 @@ class WebContents : public ExclusiveAccessContext,

  void SetImageAnimationPolicy(const std::string& new_policy);

-  // Grants |origin| access to |device|.
-  // To be used in place of ObjectPermissionContextBase::GrantObjectPermission.
-  void GrantDevicePermission(const url::Origin& origin,
-                             const base::Value* device,
-                             blink::PermissionType permissionType,
-                             content::RenderFrameHost* render_frame_host);
-
-  // Revokes |origin| access to |device|.
-  // To be used in place of ObjectPermissionContextBase::RevokeObjectPermission.
-  void RevokeDevicePermission(const url::Origin& origin,
-                              const base::Value* device,
-                              blink::PermissionType permission_type,
-                              content::RenderFrameHost* render_frame_host);
-
-  // Returns the list of devices that |origin| has been granted permission to
-  // access. To be used in place of
-  // ObjectPermissionContextBase::GetGrantedObjects.
-  bool CheckDevicePermission(const url::Origin& origin,
-                             const base::Value* device,
-                             blink::PermissionType permissionType,
-                             content::RenderFrameHost* render_frame_host);
-
  // disable copy
  WebContents(const WebContents&) = delete;
  WebContents& operator=(const WebContents&) = delete;
@@ -753,10 +725,6 @@ class WebContents : public ExclusiveAccessContext,
  // Update the html fullscreen flag in both browser and renderer.
  void UpdateHtmlApiFullscreen(bool fullscreen);

-  bool DoesDeviceMatch(const base::Value* device,
-                       const base::Value* device_to_compare,
-                       blink::PermissionType permission_type);
-
  v8::Global<v8::Value> session_;
  v8::Global<v8::Value> devtools_web_contents_;
  v8::Global<v8::Value> debugger_;
@@ -841,9 +809,6 @@ class WebContents : public ExclusiveAccessContext,
  // Stores the frame thats currently in fullscreen, nullptr if there is none.
  content::RenderFrameHost* fullscreen_frame_ = nullptr;

-  // In-memory cache that holds objects that have been granted permissions.
-  DevicePermissionMap granted_devices_;
-
  base::WeakPtrFactory<WebContents> weak_factory_{this};
 };

--- a/shell/browser/api/electron_api_web_frame_main.cc
+++ b/shell/browser/api/electron_api_web_frame_main.cc
@@ -206,7 +206,7 @@ void WebFrameMain::MaybeSetupMojoConnection() {

  // Wait for RenderFrame to be created in renderer before accessing remote.
  if (pending_receiver_ && render_frame_ &&
-      render_frame_->IsRenderFrameCreated()) {
+      render_frame_->IsRenderFrameLive()) {
    render_frame_->GetRemoteInterfaces()->GetInterface(
        std::move(pending_receiver_));
  }
--- a/shell/browser/api/gpu_info_enumerator.cc
+++ b/shell/browser/api/gpu_info_enumerator.cc
@@ -49,13 +49,13 @@ void GPUInfoEnumerator::EndGPUDevice() {
  auto& top_value = value_stack.top();
  // GPUDevice can be more than one. So create a list of all.
  // The first one is the active GPU device.
-  if (top_value->HasKey(kGPUDeviceKey)) {
+  if (top_value->FindKey(kGPUDeviceKey)) {
    base::ListValue* list;
    top_value->GetList(kGPUDeviceKey, &list);
-    list->Append(std::move(current));
+    list->Append(base::Value::FromUniquePtrValue(std::move(current)));
  } else {
-    auto gpus = std::make_unique<base::ListValue>();
-    gpus->Append(std::move(current));
+    std::unique_ptr<base::ListValue> gpus(new base::ListValue());
+    gpus->Append(base::Value::FromUniquePtrValue(std::move(current)));
    top_value->SetList(kGPUDeviceKey, std::move(gpus));
  }
  current = std::move(top_value);