chore: bump chromium to 126.0.6445.0 (main) (#41868)

* chore: bump chromium in DEPS to 125.0.6421.0 * chore: bump chromium in DEPS to 125.0.6422.0 * Add ENABLE_BASE_TRACING flags for compatibility with enable_base_tracing = false on Windows https://chromium-review.googlesource.com/c/chromium/src/+/5434658 * chore: update patches * fixup: Add ENABLE_BASE_TRACING flags for compatibility with enable_base_tracing = false on Windows * chore: bump chromium in DEPS to 126.0.6423.0 * chore: update patches * 5426599: Next generation control of unsafe-buffers-usage plugin https://chromium-review.googlesource.com/c/chromium/src/+/5426599 * chore: bump chromium in DEPS to 126.0.6425.0 * chore: update patches * Roll clang+rust llvmorg-19-init-7229-g315c88c5-2 : llvmorg-19-init-8091-gab037c4f-1 / ceab6128fa48a616bfd3e3adf4bc80133b8ee223-1 : ab71ee7a9214c2793108a41efb065aa77aeb7326-1 https://chromium-review.googlesource.com/c/chromium/src/+/5444328 Also see https://issues.chromium.org/issues/332931387 * 5445074: [Views AX] Move AXEventNotificationDetails to ui/accessibility/ https://chromium-review.googlesource.com/c/chromium/src/+/5445074 Also 5455993: [Views AX] Rename AXEventNotificationDetails to AXUpdatesAndEvents | https://chromium-review.googlesource.com/c/chromium/src/+/5455993 * Pass IsolationInfo to ContentBrowserClient::WillCreateURLLoaderFactory() https://chromium-review.googlesource.com/c/chromium/src/+/5405301 * chore: bump chromium in DEPS to 126.0.6427.0 * chore: update patches * chore: remove no longer needed patch perfetto is now turned on so this patch is no longer needed. * chore: bump chromium in DEPS to 126.0.6429.0 * chore: bump chromium in DEPS to 126.0.6431.0 * chore: bump chromium in DEPS to 126.0.6433.0 * 5466654: Do not create a console if logging to a handle https://chromium-review.googlesource.com/c/chromium/src/+/5466654 * chore: fixup patch indices * Address Linux NonClientFrameView Changes - https://chromium-review.googlesource.com/c/chromium/src/+/5180720 - https://chromium-review.googlesource.com/c/chromium/src/+/5367794 * chore: bump chromium in DEPS to 126.0.6435.0 * chore: bump chromium in DEPS to 126.0.6437.0 * chore: update patches * chore: bump chromium in DEPS to 126.0.6439.0 * chore: bump chromium in DEPS to 126.0.6441.0 * 5477689: components/crash/content/tools: Format with yapf | https://chromium-review.googlesource.com/c/chromium/src/+/5477689 * 5485006: Remove enable_print_content_analysis GN flag | https://chromium-review.googlesource.com/c/chromium/src/+/5485006 * chore: update chromium patches * chore: bump chromium in DEPS to 126.0.6443.0 * 5465608: Convert DCHECKs near RenderWidgetHost, DelegatedFrameHost to CHECK | https://chromium-review.googlesource.com/c/chromium/src/+/5465608 * 5492605: Migrate TODOs referencing old crbug IDs to the new issue tracker IDs | https://chromium-review.googlesource.com/c/chromium/src/+/5492605 * chore: update patches * chore: bump chromium in DEPS to 126.0.6445.0 * chore: update patches * 5468588: Fullscreen: Encapsulate ExclusiveAccessBubble params in a struct | https://chromium-review.googlesource.com/c/chromium/src/+/5468588 * fixup! 5485006: Remove enable_print_content_analysis GN flag | https://chromium-review.googlesource.com/c/chromium/src/+/5485006 * 5461340: `size_t` in `mojo::DataPipe[Consumer|Producer]Handle`: /components. | https://chromium-review.googlesource.com/c/chromium/src/+/5461340 * 5480213: Add an EvictIds struct to FrameEvictorClient | https://chromium-review.googlesource.com/c/chromium/src/+/5480213 * 4341506: [api] Deprecate Isolate::IdleNotificationDeadline | https://chromium-review.googlesource.com/c/v8/v8/+/4341506 * 5300826: [v8-tasks] Add source location to v8::TaskRunner, step 4/4. | https://chromium-review.googlesource.com/c/v8/v8/+/5300826 * partially revert is_newly_created to allow for browser initiated about:blank loads * add dep on app_launch_prefetch Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5420149 * install sysroots from electron not from chrome We should add a new var upstream for `download_sysroots` so that we can skip downloading chromes at all. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5462469 * refactor: make UpdateFrameHints an override Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5473548 * fix ppapi * refactor: update namespace for pwm switches Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5444617 * 5459367: WebSQL: Restrict WebSQL service creation to Android only | https://chromium-review.googlesource.com/c/chromium/src/+/5459367 * 5455853: Revert "[Clipboard] Don't add meta charset tag for async write() method on Mac." | https://chromium-review.googlesource.com/c/chromium/src/+/5455853 * fixup! refactor: update namespace for pwm switches edd9e26 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5444617 * 5147611: [heap] Add checks for ensuring position info slow path is not used in heap snapshot | https://chromium-review.googlesource.com/c/v8/v8/+/5147611 * fixup! 5412666: [heap] Also avoid heap allocation for allocation tracked functions | https://chromium-review.googlesource.com/c/v8/v8/+/5412666 * chore: add websql removal to breaking-changes.md --------- 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: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>
2026-04-10 03:01:51 -04:00 · 2024-05-10 11:21:10 -04:00
parent 0725f5c5cf
commit 9b0409f7c9
133 changed files with 1313 additions and 935 deletions
--- a/shell/browser/api/electron_api_data_pipe_holder.cc
+++ b/shell/browser/api/electron_api_data_pipe_holder.cc
@@ -83,7 +83,7 @@ class DataPipeReader {
    }

    // Read.
-    uint32_t length = remaining_size_;
+    size_t length = remaining_size_;
    result = data_pipe_->ReadData(head_, &length, MOJO_READ_DATA_FLAG_NONE);
    if (result == MOJO_RESULT_OK) {  // success
      remaining_size_ -= length;
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -130,7 +130,6 @@ uint32_t GetStorageMask(const std::vector<std::string>& storage_types) {
           {"indexdb", StoragePartition::REMOVE_DATA_MASK_INDEXEDDB},
           {"localstorage", StoragePartition::REMOVE_DATA_MASK_LOCAL_STORAGE},
           {"shadercache", StoragePartition::REMOVE_DATA_MASK_SHADER_CACHE},
-           {"websql", StoragePartition::REMOVE_DATA_MASK_WEBSQL},
           {"serviceworkers",
            StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS},
           {"cachestorage", StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE}});
@@ -172,7 +171,6 @@ constexpr auto kDataTypeLookup =
        {"indexedDB", BrowsingDataRemover::DATA_TYPE_INDEXED_DB},
        {"localStorage", BrowsingDataRemover::DATA_TYPE_LOCAL_STORAGE},
        {"serviceWorkers", BrowsingDataRemover::DATA_TYPE_SERVICE_WORKERS},
-        {"webSQL", BrowsingDataRemover::DATA_TYPE_WEB_SQL},
    });

 BrowsingDataRemover::DataType GetDataTypeMask(
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1318,12 +1318,9 @@ void WebContents::EnterFullscreen(const GURL& url,

 void WebContents::ExitFullscreen() {}

-void WebContents::UpdateExclusiveAccessExitBubbleContent(
-    const GURL& url,
-    ExclusiveAccessBubbleType bubble_type,
-    ExclusiveAccessBubbleHideCallback bubble_first_hide_callback,
-    bool notify_download,
-    bool force_update) {}
+void WebContents::UpdateExclusiveAccessBubble(
+    const ExclusiveAccessBubbleParams& params,
+    ExclusiveAccessBubbleHideCallback bubble_first_hide_callback) {}

 void WebContents::OnExclusiveAccessUserInput() {}

--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -718,12 +718,9 @@ class WebContents : public ExclusiveAccessContext,
                       ExclusiveAccessBubbleType bubble_type,
                       const int64_t display_id) override;
  void ExitFullscreen() override;
-  void UpdateExclusiveAccessExitBubbleContent(
-      const GURL& url,
-      ExclusiveAccessBubbleType bubble_type,
-      ExclusiveAccessBubbleHideCallback bubble_first_hide_callback,
-      bool notify_download,
-      bool force_update) override;
+  void UpdateExclusiveAccessBubble(
+      const ExclusiveAccessBubbleParams& params,
+      ExclusiveAccessBubbleHideCallback bubble_first_hide_callback) override;
  void OnExclusiveAccessUserInput() override;
  content::WebContents* GetActiveWebContents() override;
  bool CanUserExitFullscreen() const override;
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -565,16 +565,6 @@ void ElectronBrowserClient::AppendExtraCommandLineSwitches(
      command_line->AppendSwitch("profile-electron-init");
    }

-    // Extension background pages don't have WebContentsPreferences, but they
-    // support WebSQL by default.
-#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
-    content::RenderProcessHost* process =
-        content::RenderProcessHost::FromID(process_id);
-    if (extensions::ProcessMap::Get(process->GetBrowserContext())
-            ->Contains(process_id))
-      command_line->AppendSwitch(switches::kEnableWebSQL);
-#endif
-
    content::WebContents* web_contents =
        GetWebContentsFromProcessID(process_id);
    if (web_contents) {
@@ -1303,6 +1293,7 @@ void ElectronBrowserClient::WillCreateURLLoaderFactory(
    int render_process_id,
    URLLoaderFactoryType type,
    const url::Origin& request_initiator,
+    const net::IsolationInfo& isolation_info,
    std::optional<int64_t> navigation_id,
    ukm::SourceIdObj ukm_source_id,
    network::URLLoaderFactoryBuilder& factory_builder,
--- a/shell/browser/electron_browser_client.h
+++ b/shell/browser/electron_browser_client.h
@@ -222,6 +222,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
      int render_process_id,
      URLLoaderFactoryType type,
      const url::Origin& request_initiator,
+      const net::IsolationInfo& isolation_info,
      std::optional<int64_t> navigation_id,
      ukm::SourceIdObj ukm_source_id,
      network::URLLoaderFactoryBuilder& factory_builder,
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -535,8 +535,9 @@ ElectronBrowserContext::GetURLLoaderFactory() {
      ->WillCreateURLLoaderFactory(
          this, nullptr, -1,
          content::ContentBrowserClient::URLLoaderFactoryType::kNavigation,
-          url::Origin(), std::nullopt, ukm::kInvalidSourceIdObj,
-          factory_builder, &header_client, nullptr, nullptr, nullptr, nullptr);
+          url::Origin(), net::IsolationInfo(), std::nullopt,
+          ukm::kInvalidSourceIdObj, factory_builder, &header_client, nullptr,
+          nullptr, nullptr, nullptr);

  network::mojom::URLLoaderFactoryParamsPtr params =
      network::mojom::URLLoaderFactoryParams::New();
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -28,6 +28,7 @@
 #include "components/os_crypt/sync/key_storage_config_linux.h"
 #include "components/os_crypt/sync/key_storage_util_linux.h"
 #include "components/os_crypt/sync/os_crypt.h"
+#include "components/password_manager/core/browser/password_manager_switches.h"  // nogncheck
 #include "content/browser/browser_main_loop.h"  // nogncheck
 #include "content/public/browser/browser_child_process_host_delegate.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
@@ -515,13 +516,14 @@ void ElectronBrowserMainParts::PostCreateMainMessageLoop() {
  std::unique_ptr<os_crypt::Config> config =
      std::make_unique<os_crypt::Config>();
  // Forward to os_crypt the flag to use a specific password store.
-  config->store = command_line.GetSwitchValueASCII(::switches::kPasswordStore);
+  config->store =
+      command_line.GetSwitchValueASCII(password_manager::kPasswordStore);
  config->product_name = app_name;
  config->application_name = app_name;
  // c.f.
  // https://source.chromium.org/chromium/chromium/src/+/main:chrome/common/chrome_switches.cc;l=689;drc=9d82515060b9b75fa941986f5db7390299669ef1
  config->should_use_preference =
-      command_line.HasSwitch(::switches::kEnableEncryptionSelection);
+      command_line.HasSwitch(password_manager::kEnableEncryptionSelection);
  base::PathService::Get(DIR_SESSION_DATA, &config->user_data_path);

  bool use_backend = !config->should_use_preference ||
--- a/shell/browser/feature_list.cc
+++ b/shell/browser/feature_list.cc
@@ -37,9 +37,6 @@ void InitializeFeatureList() {
  disable_features +=
      std::string(",") + features::kSpareRendererForSitePerProcess.name;

-  // TODO(codebytere): Remove WebSQL support per crbug.com/695592.
-  enable_features += std::string(",") + blink::features::kWebSQLAccess.name;
-
 #if BUILDFLAG(IS_WIN)
  disable_features +=
      // Disable async spellchecker suggestions for Windows, which causes
--- a/shell/browser/net/asar/asar_url_loader.cc
+++ b/shell/browser/net/asar/asar_url_loader.cc
@@ -221,10 +221,9 @@ class AsarURLLoader : public network::mojom::URLLoader {
      // Write any data we read for MIME sniffing, constraining by range where
      // applicable. This will always fit in the pipe (see assertion near
      // |kDefaultFileUrlPipeSize| definition).
-      uint32_t write_size = std::min(
-          static_cast<uint32_t>(read_result.bytes_read - first_byte_to_send),
-          static_cast<uint32_t>(total_bytes_to_send));
-      const uint32_t expected_write_size = write_size;
+      size_t write_size = std::min(
+          (read_result.bytes_read - first_byte_to_send), total_bytes_to_send);
+      const size_t expected_write_size = write_size;
      MojoResult result =
          producer_handle->WriteData(&initial_read_buffer[first_byte_to_send],
                                     &write_size, MOJO_WRITE_DATA_FLAG_NONE);
--- a/shell/browser/osr/osr_render_widget_host_view.cc
+++ b/shell/browser/osr/osr_render_widget_host_view.cc
@@ -160,8 +160,11 @@ class ElectronDelegatedFrameHostClient
    return view_->GetDeviceScaleFactor();
  }

-  std::vector<viz::SurfaceId> CollectSurfaceIdsForEviction() override {
-    return view_->render_widget_host()->CollectSurfaceIdsForEviction();
+  viz::FrameEvictorClient::EvictIds CollectSurfaceIdsForEviction() override {
+    viz::FrameEvictorClient::EvictIds ids;
+    ids.embedded_ids =
+        view_->render_widget_host()->CollectSurfaceIdsForEviction();
+    return ids;
  }

  bool ShouldShowStaleContentOnEviction() override { return false; }
--- a/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
+++ b/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
@@ -45,6 +45,22 @@ void ElectronDesktopWindowTreeHostLinux::OnWidgetInitDone() {
  UpdateFrameHints();
 }

+gfx::Insets ElectronDesktopWindowTreeHostLinux::CalculateInsetsInDIP(
+    ui::PlatformWindowState window_state) const {
+  // If we are not showing frame, the insets should be zero.
+  if (!native_window_view_->IsFullscreen()) {
+    return gfx::Insets();
+  }
+
+  auto* view = static_cast<ClientFrameViewLinux*>(
+      native_window_view_->widget()->non_client_view()->frame_view());
+
+  gfx::Insets insets = view->GetBorderDecorationInsets();
+  if (base::i18n::IsRTL())
+    insets.set_left_right(insets.right(), insets.left());
+  return insets;
+}
+
 void ElectronDesktopWindowTreeHostLinux::OnBoundsChanged(
    const BoundsChange& change) {
  views::DesktopWindowTreeHostLinux::OnBoundsChanged(change);
@@ -134,10 +150,90 @@ void ElectronDesktopWindowTreeHostLinux::OnDeviceScaleFactorChanged() {

 void ElectronDesktopWindowTreeHostLinux::UpdateFrameHints() {
  if (base::FeatureList::IsEnabled(features::kWaylandWindowDecorations)) {
-    if (SupportsClientFrameShadow() && native_window_view_->has_frame() &&
-        native_window_view_->has_client_frame()) {
-      UpdateClientDecorationHints(static_cast<ClientFrameViewLinux*>(
-          native_window_view_->widget()->non_client_view()->frame_view()));
+    if (!native_window_view_->has_frame() ||
+        !native_window_view_->has_client_frame())
+      return;
+
+    ui::PlatformWindow* window = platform_window();
+    auto window_state = window->GetPlatformWindowState();
+    float scale = device_scale_factor();
+    auto* view = static_cast<ClientFrameViewLinux*>(
+        native_window_view_->widget()->non_client_view()->frame_view());
+    const gfx::Size widget_size =
+        view->GetWidget()->GetWindowBoundsInScreen().size();
+
+    if (SupportsClientFrameShadow()) {
+      auto insets = CalculateInsetsInDIP(window_state);
+      if (insets.IsEmpty()) {
+        window->SetInputRegion(std::nullopt);
+      } else {
+        gfx::Rect input_bounds(widget_size);
+        input_bounds.Inset(insets - view->GetInputInsets());
+        input_bounds = gfx::ScaleToEnclosingRect(input_bounds, scale);
+        window->SetInputRegion(
+            std::optional<std::vector<gfx::Rect>>({input_bounds}));
+      }
+    }
+
+    if (ui::OzonePlatform::GetInstance()->IsWindowCompositingSupported()) {
+      // Set the opaque region.
+      std::vector<gfx::Rect> opaque_region;
+      if (!native_window_view_->IsFullscreen()) {
+        // The opaque region is a list of rectangles that contain only fully
+        // opaque pixels of the window.  We need to convert the clipping
+        // rounded-rect into this format.
+        SkRRect rrect = view->GetRoundedWindowContentBounds();
+        gfx::RectF rectf(view->GetWindowContentBounds());
+        rectf.Scale(scale);
+        // It is acceptable to omit some pixels that are opaque, but the region
+        // must not include any translucent pixels.  Therefore, we must
+        // conservatively scale to the enclosed rectangle.
+        gfx::Rect rect = gfx::ToEnclosedRect(rectf);
+
+        // Create the initial region from the clipping rectangle without rounded
+        // corners.
+        SkRegion region(gfx::RectToSkIRect(rect));
+
+        // Now subtract out the small rectangles that cover the corners.
+        struct {
+          SkRRect::Corner corner;
+          bool left;
+          bool upper;
+        } kCorners[] = {
+            {SkRRect::kUpperLeft_Corner, true, true},
+            {SkRRect::kUpperRight_Corner, false, true},
+            {SkRRect::kLowerLeft_Corner, true, false},
+            {SkRRect::kLowerRight_Corner, false, false},
+        };
+        for (const auto& corner : kCorners) {
+          auto radii = rrect.radii(corner.corner);
+          auto rx = std::ceil(scale * radii.x());
+          auto ry = std::ceil(scale * radii.y());
+          auto corner_rect = SkIRect::MakeXYWH(
+              corner.left ? rect.x() : rect.right() - rx,
+              corner.upper ? rect.y() : rect.bottom() - ry, rx, ry);
+          region.op(corner_rect, SkRegion::kDifference_Op);
+        }
+
+        auto translucent_top_area_rect = SkIRect::MakeXYWH(
+            rect.x(), rect.y(), rect.width(),
+            std::ceil(view->GetTranslucentTopAreaHeight() * scale - rect.y()));
+        region.op(translucent_top_area_rect, SkRegion::kDifference_Op);
+
+        // Convert the region to a list of rectangles.
+        for (SkRegion::Iterator i(region); !i.done(); i.next()) {
+          opaque_region.push_back(gfx::SkIRectToRect(i.rect()));
+        }
+      } else {
+        // The entire window except for the translucent top is opaque.
+        gfx::Rect opaque_region_dip(widget_size);
+        gfx::Insets insets;
+        insets.set_top(view->GetTranslucentTopAreaHeight());
+        opaque_region_dip.Inset(insets);
+        opaque_region.push_back(
+            gfx::ScaleToEnclosingRect(opaque_region_dip, scale));
+      }
+      window->SetOpaqueRegion(opaque_region);
    }

    SizeConstraintsChanged();
@@ -145,83 +241,6 @@ void ElectronDesktopWindowTreeHostLinux::UpdateFrameHints() {
 }

 void ElectronDesktopWindowTreeHostLinux::UpdateClientDecorationHints(
-    ClientFrameViewLinux* view) {
-  ui::PlatformWindow* window = platform_window();
-  bool showing_frame = !native_window_view_->IsFullscreen();
-  float scale = device_scale_factor();
-
-  bool should_set_opaque_region = views::Widget::IsWindowCompositingSupported();
-
-  gfx::Insets insets;
-  gfx::Insets input_insets;
-  if (showing_frame) {
-    insets = view->GetBorderDecorationInsets();
-    if (base::i18n::IsRTL()) {
-      insets.set_left_right(insets.right(), insets.left());
-    }
-
-    input_insets = view->GetInputInsets();
-  }
-  const auto tiled_edges = view->tiled_edges();
-  if (tiled_edges.left)
-    insets.set_left(0);
-  if (tiled_edges.right)
-    insets.set_right(0);
-  if (tiled_edges.top)
-    insets.set_top(0);
-  if (tiled_edges.bottom)
-    insets.set_bottom(0);
-  gfx::Insets scaled_insets = gfx::ScaleToCeiledInsets(insets, scale);
-  window->SetDecorationInsets(&scaled_insets);
-
-  gfx::Rect input_bounds(view->GetWidget()->GetWindowBoundsInScreen().size());
-  input_bounds.Inset(insets + input_insets);
-  window->SetInputRegion(std::optional<std::vector<gfx::Rect>>(
-      {gfx::ScaleToEnclosingRect(input_bounds, scale)}));
-
-  if (should_set_opaque_region) {
-    // The opaque region is a list of rectangles that contain only fully
-    // opaque pixels of the window.  We need to convert the clipping
-    // rounded-rect into this format.
-    SkRRect rrect = view->GetRoundedWindowContentBounds();
-    gfx::RectF rectf(view->GetWindowContentBounds());
-    rectf.Scale(scale);
-    // It is acceptable to omit some pixels that are opaque, but the region
-    // must not include any translucent pixels.  Therefore, we must
-    // conservatively scale to the enclosed rectangle.
-    gfx::Rect rect = gfx::ToEnclosedRect(rectf);
-
-    // Create the initial region from the clipping rectangle without rounded
-    // corners.
-    SkRegion region(gfx::RectToSkIRect(rect));
-
-    // Now subtract out the small rectangles that cover the corners.
-    struct {
-      SkRRect::Corner corner;
-      bool left;
-      bool upper;
-    } kCorners[] = {
-        {SkRRect::kUpperLeft_Corner, true, true},
-        {SkRRect::kUpperRight_Corner, false, true},
-        {SkRRect::kLowerLeft_Corner, true, false},
-        {SkRRect::kLowerRight_Corner, false, false},
-    };
-    for (const auto& corner : kCorners) {
-      auto radii = rrect.radii(corner.corner);
-      auto rx = std::ceil(scale * radii.x());
-      auto ry = std::ceil(scale * radii.y());
-      auto corner_rect = SkIRect::MakeXYWH(
-          corner.left ? rect.x() : rect.right() - rx,
-          corner.upper ? rect.y() : rect.bottom() - ry, rx, ry);
-      region.op(corner_rect, SkRegion::kDifference_Op);
-    }
-
-    // Convert the region to a list of rectangles.
-    std::vector<gfx::Rect> opaque_region;
-    for (SkRegion::Iterator i(region); !i.done(); i.next())
-      opaque_region.emplace_back(gfx::SkIRectToRect(i.rect()));
-    window->SetOpaqueRegion(opaque_region);
-  }
-}
+    ClientFrameViewLinux* view) {}

 }  // namespace electron
--- a/shell/browser/ui/electron_desktop_window_tree_host_linux.h
+++ b/shell/browser/ui/electron_desktop_window_tree_host_linux.h
@@ -44,6 +44,8 @@ class ElectronDesktopWindowTreeHostLinux
  void OnWidgetInitDone() override;

  // ui::PlatformWindowDelegate
+  gfx::Insets CalculateInsetsInDIP(
+      ui::PlatformWindowState window_state) const override;
  void OnBoundsChanged(const BoundsChange& change) override;
  void OnWindowStateChanged(ui::PlatformWindowState old_state,
                            ui::PlatformWindowState new_state) override;
@@ -55,8 +57,10 @@ class ElectronDesktopWindowTreeHostLinux
  // views::OnDeviceScaleFactorChanged:
  void OnDeviceScaleFactorChanged() override;

+  // views::DesktopWindowTreeHostLinux:
+  void UpdateFrameHints() override;
+
 private:
-  void UpdateFrameHints();
  void UpdateClientDecorationHints(ClientFrameViewLinux* view);
  void UpdateWindowState(ui::PlatformWindowState new_state);

--- a/shell/browser/ui/views/client_frame_view_linux.cc
+++ b/shell/browser/ui/views/client_frame_view_linux.cc
@@ -501,7 +501,10 @@ views::View* ClientFrameViewLinux::TargetForRect(views::View* root,
  return views::NonClientFrameView::TargetForRect(root, rect);
 }

-BEGIN_METADATA(ClientFrameViewLinux)
-END_METADATA
+int ClientFrameViewLinux::GetTranslucentTopAreaHeight() const {
+  return 0;
+}
+
+BEGIN_METADATA(ClientFrameViewLinux) END_METADATA

 }  // namespace electron
--- a/shell/browser/ui/views/client_frame_view_linux.h
+++ b/shell/browser/ui/views/client_frame_view_linux.h
@@ -44,6 +44,7 @@ class ClientFrameViewLinux : public FramelessView,
  gfx::Insets GetInputInsets() const;
  gfx::Rect GetWindowContentBounds() const;
  SkRRect GetRoundedWindowContentBounds() const;
+  int GetTranslucentTopAreaHeight() const;
  // Returns which edges of the frame are tiled.
  const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
  void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
--- a/shell/browser/ui/webui/accessibility_ui.cc
+++ b/shell/browser/ui/webui/accessibility_ui.cc
@@ -25,7 +25,6 @@
 #include "chrome/grit/accessibility_resources_map.h"  // nogncheck
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
-#include "content/public/browser/ax_event_notification_details.h"
 #include "content/public/browser/ax_inspect_factory.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_context.h"
@@ -43,6 +42,7 @@
 #include "shell/browser/native_window.h"
 #include "shell/browser/window_list.h"
 #include "ui/accessibility/accessibility_features.h"
+#include "ui/accessibility/ax_updates_and_events.h"
 #include "ui/accessibility/platform/ax_platform_node.h"
 #include "ui/accessibility/platform/ax_platform_node_delegate.h"
 #include "ui/base/webui/web_ui_util.h"
--- a/shell/browser/web_contents_preferences.cc
+++ b/shell/browser/web_contents_preferences.cc
@@ -124,7 +124,6 @@ void WebContentsPreferences::Clear() {
  images_ = true;
  text_areas_are_resizable_ = true;
  webgl_ = true;
-  enable_websql_ = true;
  enable_preferred_size_mode_ = false;
  web_security_ = true;
  allow_running_insecure_content_ = false;
@@ -183,7 +182,6 @@ void WebContentsPreferences::SetFromDictionary(
  web_preferences.Get(options::kTextAreasAreResizable,
                      &text_areas_are_resizable_);
  web_preferences.Get(options::kWebGL, &webgl_);
-  web_preferences.Get(options::kEnableWebSQL, &enable_websql_);
  web_preferences.Get(options::kEnablePreferredSizeMode,
                      &enable_preferred_size_mode_);
  web_preferences.Get(options::kWebSecurity, &web_security_);
@@ -382,7 +380,6 @@ void WebContentsPreferences::SaveLastPreferences() {
  dict.Set(options::kSandbox, IsSandboxed());
  dict.Set(options::kContextIsolation, context_isolation_);
  dict.Set(options::kJavaScript, javascript_);
-  dict.Set(options::kEnableWebSQL, enable_websql_);
  dict.Set(options::kWebviewTag, webview_tag_);
  dict.Set("disablePopups", disable_popups_);
  dict.Set(options::kWebSecurity, web_security_);
@@ -492,7 +489,6 @@ void WebContentsPreferences::OverrideWebkitPrefs(

  prefs->enable_plugins = plugins_;
  prefs->webview_tag = webview_tag_;
-  prefs->enable_websql = enable_websql_;

  prefs->v8_cache_options = v8_cache_options_;
 }
--- a/shell/browser/web_contents_preferences.h
+++ b/shell/browser/web_contents_preferences.h
@@ -110,7 +110,6 @@ class WebContentsPreferences
  bool images_;
  bool text_areas_are_resizable_;
  bool webgl_;
-  bool enable_websql_;
  bool enable_preferred_size_mode_;
  bool web_security_;
  bool allow_running_insecure_content_;
--- a/shell/common/gin_converters/net_converter.cc
+++ b/shell/common/gin_converters/net_converter.cc
@@ -361,7 +361,7 @@ class ChunkedDataPipeReadableStream
                              base::Unretained(this)));
    }

-    uint32_t num_bytes = buf->ByteLength();
+    size_t num_bytes = buf->ByteLength();
    if (size_ && num_bytes > *size_ - bytes_read_)
      num_bytes = *size_ - bytes_read_;
    MojoResult rv = data_pipe_->ReadData(
--- a/shell/common/options_switches.cc
+++ b/shell/common/options_switches.cc
@@ -184,8 +184,6 @@ const char kHiddenPage[] = "hiddenPage";
 const char kSpellcheck[] = "spellcheck";
 #endif

-const char kEnableWebSQL[] = "enableWebSQL";
-
 const char kEnablePreferredSizeMode[] = "enablePreferredSizeMode";

 const char ktitleBarOverlay[] = "titleBarOverlay";
@@ -267,8 +265,6 @@ const char kEnableAuthNegotiatePort[] = "enable-auth-negotiate-port";
 // If set, NTLM v2 is disabled for POSIX platforms.
 const char kDisableNTLMv2[] = "disable-ntlm-v2";

-const char kEnableWebSQL[] = "enable-websql";
-
 }  // namespace switches

 }  // namespace electron
--- a/shell/common/options_switches.h
+++ b/shell/common/options_switches.h
@@ -87,7 +87,6 @@ extern const char kImages[];
 extern const char kTextAreasAreResizable[];
 extern const char kWebGL[];
 extern const char kNavigateOnDragDrop[];
-extern const char kEnableWebSQL[];
 extern const char kEnablePreferredSizeMode[];

 extern const char kHiddenPage[];
@@ -129,8 +128,6 @@ extern const char kAuthServerWhitelist[];
 extern const char kAuthNegotiateDelegateWhitelist[];
 extern const char kEnableAuthNegotiatePort[];
 extern const char kDisableNTLMv2[];
-
-extern const char kEnableWebSQL[];
 }  // namespace switches

 }  // namespace electron
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -806,7 +806,6 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
 #endif

  void ClearCache(v8::Isolate* isolate) {
-    isolate->IdleNotificationDeadline(0.5);
    blink::WebCache::Clear();
    base::MemoryPressureListener::NotifyMemoryPressure(
        base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
--- a/shell/renderer/content_settings_observer.cc
+++ b/shell/renderer/content_settings_observer.cc
@@ -23,14 +23,6 @@ ContentSettingsObserver::ContentSettingsObserver(
 ContentSettingsObserver::~ContentSettingsObserver() = default;

 bool ContentSettingsObserver::AllowStorageAccessSync(StorageType storage_type) {
-  if (storage_type == StorageType::kDatabase &&
-      // Command line support is still relevant for extensions.
-      !(base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableWebSQL) ||
-        render_frame()->GetBlinkPreferences().enable_websql)) {
-    return false;
-  }
-
  blink::WebFrame* frame = render_frame()->GetWebFrame();
  if (frame->GetSecurityOrigin().IsOpaque() ||
      frame->Top()->GetSecurityOrigin().IsOpaque())