chore: bump chromium to 82.0.4085.10 (9-x-y) (#22506)

* chore: bump chromium in DEPS to 82.0.4076.1 * update patches * chore: bump chromium in DEPS to 82.0.4077.1 * update v8 patches * Remove deprecated wasm module type check https://chromium-review.googlesource.com/c/v8/v8/+/2033170 * chore: bump chromium in DEPS to 82.0.4078.0 * chore: bump chromium in DEPS to 82.0.4079.0 * chore: bump chromium in DEPS to 82.0.4080.0 * chore: bump chromium in DEPS to 82.0.4080.1 * chore: bump chromium in DEPS to 82.0.4081.2 * Update patches * chore: bump chromium in DEPS to 82.0.4082.1 * Remove cursor_types.h in favor of cursor_type.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2052103 (cherry picked from commit 3b6e4d4a1a) * Refactor extensions report in management disclosure page https://chromium-review.googlesource.com/c/chromium/src/+/2038774 (cherry picked from commit b2ae06307d) * Rename an old referrer policy value https://chromium-review.googlesource.com/c/chromium/src/+/2082856 (cherry picked from commit 3cb8af2515) * Fixup compiler errors * Move GLHelper to gpu:: https://chromium-review.googlesource.com/c/chromium/src/+/2023282 (cherry picked from commit ea8e347088) * [api] Remove deprecated wasm module type check https://chromium-review.googlesource.com/c/v8/v8/+/2033170 (cherry picked from commit 937988e6ce) * Replace blink::WebCursorInfo with ui::Cursor https://chromium-review.googlesource.com/c/chromium/src/+/1997138 (cherry picked from commit 3e348c4d59) * DownloadURLParameters: Remove NetworkIsolationKey parameter. https://chromium-review.googlesource.com/c/chromium/src/+/2050987 (cherry picked from commit 9b4aae745e) * Convert FrameHostMsg_UpdateFaviconURL to mojo https://chromium-review.googlesource.com/c/chromium/src/+/2043181 (cherry picked from commit 11b9c27eee) * Merge ui::ContextFactoryPrivate with ui::ContextFactory https://chromium-review.googlesource.com/c/chromium/src/+/2047728 (cherry picked from commit 176876f243) * fix pdf viewer tests by binding more mojo things (cherry picked from commit 74def418df) * chore: bump chromium in DEPS to 82.0.4083.1 * Update electron_swiftshader_binaries deps https://chromium-review.googlesource.com/c/chromium/src/+/2056931 (cherry picked from commit 312f11129f) * Update patches * Use Promise with RequestPointerLock calls https://chromium-review.googlesource.com/c/chromium/src/+/2069199 (cherry picked from commit 34350db4bd) * chore: bump chromium in DEPS to 82.0.4084.1 * Replace content::CursorInfo with ui::Cursor https://chromium-review.googlesource.com/c/chromium/src/+/1999201 (cherry picked from commit 6b3b850692) * Convert MaterialDesignController to a true singleton. https://chromium-review.googlesource.com/c/chromium/src/+/2090877 (cherry picked from commit 21ced9206d) * Drop WebContentsView::RenderViewCreated hook https://chromium-review.googlesource.com/c/chromium/src/+/2093535 (cherry picked from commit 9ff4e65053) * Update patches * Splitting context_menu_params.h into separate browser VS common parts. https://chromium-review.googlesource.com/c/chromium/src/+/2097468 * Fix DCHECK on OnThemeChanged() https://chromium-review.googlesource.com/c/chromium/src/+/2090713 (cherry picked from commit fcec5f74d1) * chore: bump chromium in DEPS to 82.0.4085.1 * chore: bump chromium in DEPS to 82.0.4085.5 * chore: bump chromium in DEPS to 82.0.4085.7 * chore: bump chromium in DEPS to 82.0.4085.9 * Add debugging for TAB tests * update patches * fix: add patch to fix linux arm build (#22523) (cherry picked from commit 479354e721) * chore: bump chromium in DEPS to 82.0.4085.10 * Check PointerLock requests for new options and update accordingly https://chromium-review.googlesource.com/c/chromium/src/+/2071788 * Update for changes from master roller review * FIXME: skip Menu.setApplicationMenu(null) test (cherry picked from commit 305f167889) * Revert "Add debugging for TAB tests" This reverts commit af393c1b0b. Co-authored-by: Jeremy Apthorp <jeremya@chromium.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
2026-04-10 03:01:51 -04:00 · 2020-03-17 13:56:25 -07:00
parent d32e1f8d97
commit 3d941fc464
95 changed files with 733 additions and 758 deletions
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -631,7 +631,7 @@ void Session::DownloadURL(const GURL& url) {
  auto* download_manager =
      content::BrowserContext::GetDownloadManager(browser_context());
  auto download_params = std::make_unique<download::DownloadUrlParameters>(
-      url, MISSING_TRAFFIC_ANNOTATION, net::NetworkIsolationKey());
+      url, MISSING_TRAFFIC_ANNOTATION);
  download_manager->DownloadUrl(std::move(download_params));
 }

--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -26,6 +26,7 @@
 #include "content/browser/renderer_host/render_widget_host_view_base.h"  // nogncheck
 #include "content/common/widget_messages.h"
 #include "content/public/browser/child_process_security_policy.h"
+#include "content/public/browser/context_menu_params.h"
 #include "content/public/browser/download_request_utils.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/native_web_keyboard_event.h"
@@ -42,7 +43,6 @@
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/context_menu_params.h"
 #include "electron/buildflags/buildflags.h"
 #include "electron/shell/common/api/api.mojom.h"
 #include "mojo/public/cpp/bindings/associated_remote.h"
@@ -91,7 +91,8 @@
 #include "third_party/blink/public/mojom/favicon/favicon_url.mojom.h"
 #include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
 #include "third_party/blink/public/mojom/frame/fullscreen.mojom.h"
-#include "third_party/blink/public/platform/web_cursor_info.h"
+#include "ui/base/cursor/cursor.h"
+#include "ui/base/mojom/cursor_type.mojom-shared.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"

@@ -1235,12 +1236,12 @@ void WebContents::TitleWasSet(content::NavigationEntry* entry) {
 }

 void WebContents::DidUpdateFaviconURL(
-    const std::vector<content::FaviconURL>& urls) {
+    const std::vector<blink::mojom::FaviconURLPtr>& urls) {
  std::set<GURL> unique_urls;
  for (const auto& iter : urls) {
-    if (iter.icon_type != blink::mojom::FaviconIconType::kFavicon)
+    if (iter->icon_type != blink::mojom::FaviconIconType::kFavicon)
      continue;
-    const GURL& url = iter.icon_url;
+    const GURL& url = iter->icon_url;
    if (url.is_valid())
      unique_urls.insert(url);
  }
@@ -2323,17 +2324,18 @@ bool WebContents::IsBeingCaptured() {
  return web_contents()->IsBeingCaptured();
 }

-void WebContents::OnCursorChange(const content::WebCursor& cursor) {
-  const content::CursorInfo& info = cursor.info();
+void WebContents::OnCursorChange(const content::WebCursor& webcursor) {
+  const ui::Cursor& cursor = webcursor.cursor();

-  if (info.type == ui::CursorType::kCustom) {
-    Emit("cursor-changed", CursorTypeToString(info),
-         gfx::Image::CreateFrom1xBitmap(info.custom_image),
-         info.image_scale_factor,
-         gfx::Size(info.custom_image.width(), info.custom_image.height()),
-         info.hotspot);
+  if (cursor.type() == ui::mojom::CursorType::kCustom) {
+    Emit("cursor-changed", CursorTypeToString(cursor),
+         gfx::Image::CreateFrom1xBitmap(cursor.custom_bitmap()),
+         cursor.image_scale_factor(),
+         gfx::Size(cursor.custom_bitmap().width(),
+                   cursor.custom_bitmap().height()),
+         cursor.custom_hotspot());
  } else {
-    Emit("cursor-changed", CursorTypeToString(info));
+    Emit("cursor-changed", CursorTypeToString(cursor));
  }
 }

--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -18,7 +18,6 @@
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "content/public/common/favicon_url.h"
 #include "electron/buildflags/buildflags.h"
 #include "electron/shell/common/api/api.mojom.h"
 #include "gin/handle.h"
@@ -29,6 +28,7 @@
 #include "shell/browser/api/save_page_handler.h"
 #include "shell/browser/common_web_contents_delegate.h"
 #include "shell/common/gin_helper/trackable_object.h"
+#include "third_party/blink/public/mojom/favicon/favicon_url.mojom.h"
 #include "ui/gfx/image/image.h"

 #if BUILDFLAG(ENABLE_PRINTING)
@@ -474,7 +474,7 @@ class WebContents : public gin_helper::TrackableObject<WebContents>,
      const content::LoadCommittedDetails& load_details) override;
  void TitleWasSet(content::NavigationEntry* entry) override;
  void DidUpdateFaviconURL(
-      const std::vector<content::FaviconURL>& urls) override;
+      const std::vector<blink::mojom::FaviconURLPtr>& urls) override;
  void PluginCrashed(const base::FilePath& plugin_path,
                     base::ProcessId plugin_pid) override;
  void MediaStartedPlaying(const MediaPlayerInfo& video_type,