chore: bump chromium to 98.0.4706.0 (main) (#31555)

* chore: bump chromium in DEPS to 97.0.4678.0 * chore: bump chromium in DEPS to 97.0.4679.0 * chore: bump chromium in DEPS to 97.0.4680.0 * chore: bump chromium in DEPS to 97.0.4681.0 * chore: bump chromium in DEPS to 97.0.4682.0 * chore: update patches * 3234737: Disable -Wunused-but-set-variable Ref: 3234737 * 3216953: Reland "Move task-related files from base/ to base/task/" Ref: 3216953 * 3202710: TimeDelta factory function migration. Ref: 3202710 * 3226841: Rename WCO::RenderProcessGone to PrimaryMainFrameRenderProcessGone Ref: 3226841 * 3212165: blink/gin: changes blink to load snapshot based on runtime information Ref: 3212165 * 3220292: Deprecate returning a GURL from GURL::GetOrigin() Ref: 3220292 * 3231995: build: Enable -Wbitwise-instead-of-logical everywhere except iOS and Windows Ref: 3231995 * 3205121: Remove base::DictionaryValue::GetDouble Ref: 3205121 * 3208413: [flags] Make --js-flags settings have priority over V8 features Ref: 3208413 * chore: bump chromium in DEPS to 97.0.4683.0 * chore: update patches * 3188834: Combine RWHVBase GetCurrentDeviceScaleFactor/GetDeviceScaleFactor Ref: 3188834 * chore: update process_singleton patches * chore: bump chromium in DEPS to 97.0.4684.0 * chore: update patches * chore: bump chromium in DEPS to 97.0.4685.0 * chore: update patches * chore: bump chromium in DEPS to 97.0.4686.0 * chore: update patches * chore: bump chromium in DEPS to 97.0.4687.0 * chore: update patches * chore: bump chromium in DEPS to 97.0.4688.0 * chore: update patches * 3247722: Use correct source_site_instance if navigating via context menu Ref: 3247722 Update signature of HandleContextMenu() * 3247722: Use correct source_site_instance if navigating via context menu Ref: 3247722 Update signature of HandleContextMenu() * 3223422: Remove PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE enum option Ref: 3223422 sync pepper_plugin_support.patch with upstream * chore: bump chromium in DEPS to 97.0.4689.0 * 3247791: ax_mac_merge: Merge AX Math attribute implementations Xref: ax_mac_merge: Merge AX Math attribute implementations chore: fix minor patch shear in #includes * 3243425: Add VisibleTimeRequestTrigger helper class Xref: 3243425 chore: fix minor patch shear in #includes * chore: regen chromium patches * fixup! 3247722: Use correct source_site_instance if navigating via context menu * chore: bump chromium in DEPS to 97.0.4690.0 * 3188659: Window Placement: make GetScreenInfo(s) const Xref: 3188659 simple sync GetScreenInfo with upstream refactor * chore: update patches * chore: bump chromium in DEPS to 97.0.4690.4 * chore: bump chromium in DEPS to 97.0.4692.0 * 3198073: ozone: //content: clean up from USE_X11 Xref: 3198073 Fixing patch shear. Nothing to see here. * 3252338: Remove label images checkbox from chrome://accessibility page Xref: 3252338 Part of our a11y patch is no longer needed due to upstream label removal * 3258183: Remove DISALLOW_IMPLICIT_CONSTRUCTORS() definition Xref: 3258183 Replace our use of the macro with explicitly-deleted class methods. See 3256952 for upstream examples of this same replacement. * chore: update patches * 3247295: Unwind SecurityStyleExplanations Xref: 3247295 update GetSecurityStyle() signature and impl to match upstream changes * 3259578: media: grabs lock to ensure video output when occluded Xref: 3259578 Add stub for new upstream virtual method OnCapturerCountChanged() * fixup! 3247295: Unwind SecurityStyleExplanations * 3238504: Fix up drag image is not shown from bookmark bar Xref: 3238504 SetDragImage() no longer takes a widget argument * 3217452: [devtools] Add getSyncInformation host binding Xref: 3217452 Add stub for new upstream method GetSyncInformation(). Stub sends info back to caller saying that syncing is disabled. * chore: bump chromium in DEPS to 98.0.4693.0 * chore: bump chromium in DEPS to 98.0.4694.0 * chore: bump chromium in DEPS to 98.0.4695.0 * chore: bump chromium in DEPS to 98.0.4696.0 * chore: bump chromium in DEPS to 98.0.4697.0 * chore: bump chromium in DEPS to 98.0.4699.0 * chore: bump chromium in DEPS to 98.0.4701.0 * chore: bump chromium in DEPS to 98.0.4703.0 * chore: bump chromium in DEPS to 98.0.4705.0 * chore: bump chromium in DEPS to 98.0.4706.0 * chore: update patches * 3279210: Rename "base/macros.h" => "base/ignore_result.h" 3279210 * 3259964: Remove all DISALLOW_COPY_AND_ASSIGNs 3259964 * 3269029: blink/gin: sets histogram callbacks during isolate creation 3269029 * fixup after rebase * [content] Make ContentMainParams and MainFunctionParams move-only 3244976 * 3255305: Stop sending the securityStateChanged event and unwind 3255305 * [Blink] Add promise support to WebLocalFrame::RequestExecuteScript() 3230010 * 3256162: Simplify RWHV Show and ShowWithVisibility handling 3256162 * 3263824: ozone: //ui/base: clean up from USE_X11 1/* 3263824 * Request or cancel RecordContentToPresentationTimeRequest during capture 3256802 * appcache: remove BrowsingData/quota references 3255725 * [Autofill] Don't show Autofill dropdown if overlaps with permissions 3236729 * Rename to_different_document to should_show_loading_ui in LoadingStateChanged() callbacks 3268574 * cleanup patch * fixup [content] Make ContentMainParams and MainFunctionParams move-only * 3279210: Rename "base/macros.h" => "base/ignore_result.h" 3279210 * ozone: //chrome/browser clean up from USE_X11 3186490 Refs: https://github.com/electron/electron/issues/31382 * chore: update support_mixed_sandbox_with_zygote.patch * Enable -Wunused-but-set-variable. Refs 3234737 * fixup! ozone: //ui/base: clean up from USE_X11 1/* * fixup! ozone: //chrome/browser clean up from USE_X11 * chore: fix deprecation warning in libuv * chore: fixup for lint * 3251161: Reland "Make the Clang update.py script require Python 3" 3251161 * fixup: Enable -Wunused-but-set-variable. * [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA 3262369 * Replace sandbox::policy::SandboxType with mojom Sandbox enum 3213677 * fixup: [content] Make ContentMainParams and MainFunctionParams move-only * build: ensure angle has a full git checkout available to it * fixup: [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA * fixup lint * [unseasoned-pdf] Dispatch 'afterprint' event in PDF plugin frame 3223434 * fixup: [Autofill] Don't show Autofill dropdown if overlaps with permissions * 3217591: Move browser UI CSS color parsing to own file part 2/2 3217591 * Make kNoSandboxAndElevatedPrivileges only available to utilities 3276784 * 3211575: [modules] Change ScriptOrModule to custom Struct 3211575 * Address review feedback * chore: update patches * 3211575: [modules] Change ScriptOrModule to custom Struct 3211575 * fix: unused variable compat * chore: remove redundant patch * fixup for 3262517: Re-enable WindowCaptureMacV2 3262517 * chore: cleanup todo The functions added in 3256802 are not used by offscreen rendering. * fixup: update mas_no_private_api.patch * 3216879: [PA] Make features::kPartitionAllocLazyCommit to be PartitionOptions::LazyCommit Ref: 3216879 Fixes up commit b2f1aca95604ec61649808c846657454097e6935 * chore: cleanup support_mixed_sandbox_with_zygote.patch * test: use window focus event instead of delay to wait for webContents focus Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
2021-11-24 09:45:59 +01:00 · 2021-11-24 09:45:59 +01:00 · bd10b19b0c
commit bd10b19b0c
parent 065cad6d2c
159 changed files with 1221 additions and 1047 deletions
--- a/shell/browser/ui/autofill_popup.cc
+++ b/shell/browser/ui/autofill_popup.cc
@ -8,7 +8,6 @@

 #include "base/feature_list.h"
 #include "base/i18n/rtl.h"
-#include "chrome/browser/ui/views/autofill/autofill_popup_view_utils.h"
 #include "components/autofill/core/common/autofill_features.h"
 #include "electron/buildflags/buildflags.h"
 #include "mojo/public/cpp/bindings/associated_remote.h"
@ -31,6 +30,134 @@

 namespace electron {

+void CalculatePopupXAndWidthHorizontallyCentered(
+    int popup_preferred_width,
+    const gfx::Rect& content_area_bounds,
+    const gfx::Rect& element_bounds,
+    bool is_rtl,
+    gfx::Rect* bubble_bounds) {
+  // The preferred horizontal starting point for the pop-up is at the horizontal
+  // center of the field.
+  int preferred_starting_point =
+      base::clamp(element_bounds.x() + (element_bounds.size().width() / 2),
+                  content_area_bounds.x(), content_area_bounds.right());
+
+  // The space available to the left and to the right.
+  int space_to_right = content_area_bounds.right() - preferred_starting_point;
+  int space_to_left = preferred_starting_point - content_area_bounds.x();
+
+  // Calculate the pop-up width. This is either the preferred pop-up width, or
+  // alternatively the maximum space available if there is not sufficient space
+  // for the preferred width.
+  int popup_width =
+      std::min(popup_preferred_width, space_to_left + space_to_right);
+
+  // Calculates the space that is available to grow into the preferred
+  // direction. In RTL, this is the space to the right side of the content
+  // area, in LTR this is the space to the left side of the content area.
+  int space_to_grow_in_preferred_direction =
+      is_rtl ? space_to_left : space_to_right;
+
+  // Calculate how much the pop-up needs to grow into the non-preferred
+  // direction.
+  int amount_to_grow_in_unpreffered_direction =
+      std::max(0, popup_width - space_to_grow_in_preferred_direction);
+
+  bubble_bounds->set_width(popup_width);
+  if (is_rtl) {
+    // Note, in RTL the |pop_up_width| must be subtracted to achieve
+    // right-alignment of the pop-up with the element.
+    bubble_bounds->set_x(preferred_starting_point - popup_width +
+                         amount_to_grow_in_unpreffered_direction);
+  } else {
+    bubble_bounds->set_x(preferred_starting_point -
+                         amount_to_grow_in_unpreffered_direction);
+  }
+}
+
+void CalculatePopupXAndWidth(int popup_preferred_width,
+                             const gfx::Rect& content_area_bounds,
+                             const gfx::Rect& element_bounds,
+                             bool is_rtl,
+                             gfx::Rect* bubble_bounds) {
+  int right_growth_start = base::clamp(
+      element_bounds.x(), content_area_bounds.x(), content_area_bounds.right());
+  int left_growth_end =
+      base::clamp(element_bounds.right(), content_area_bounds.x(),
+                  content_area_bounds.right());
+
+  int right_available = content_area_bounds.right() - right_growth_start;
+  int left_available = left_growth_end - content_area_bounds.x();
+
+  int popup_width = std::min(popup_preferred_width,
+                             std::max(left_available, right_available));
+
+  // Prefer to grow towards the end (right for LTR, left for RTL). But if there
+  // is not enough space available in the desired direction and more space in
+  // the other direction, reverse it.
+  bool grow_left = false;
+  if (is_rtl) {
+    grow_left =
+        left_available >= popup_width || left_available >= right_available;
+  } else {
+    grow_left =
+        right_available < popup_width && right_available < left_available;
+  }
+
+  bubble_bounds->set_width(popup_width);
+  bubble_bounds->set_x(grow_left ? left_growth_end - popup_width
+                                 : right_growth_start);
+}
+
+void CalculatePopupYAndHeight(int popup_preferred_height,
+                              const gfx::Rect& content_area_bounds,
+                              const gfx::Rect& element_bounds,
+                              gfx::Rect* bubble_bounds) {
+  int top_growth_end = base::clamp(element_bounds.y(), content_area_bounds.y(),
+                                   content_area_bounds.bottom());
+  int bottom_growth_start =
+      base::clamp(element_bounds.bottom(), content_area_bounds.y(),
+                  content_area_bounds.bottom());
+
+  int top_available = top_growth_end - content_area_bounds.y();
+  int bottom_available = content_area_bounds.bottom() - bottom_growth_start;
+
+  bubble_bounds->set_height(popup_preferred_height);
+  bubble_bounds->set_y(top_growth_end);
+
+  if (bottom_available >= popup_preferred_height ||
+      bottom_available >= top_available) {
+    bubble_bounds->AdjustToFit(
+        gfx::Rect(bubble_bounds->x(), element_bounds.bottom(),
+                  bubble_bounds->width(), bottom_available));
+  } else {
+    bubble_bounds->AdjustToFit(
+        gfx::Rect(bubble_bounds->x(), content_area_bounds.y(),
+                  bubble_bounds->width(), top_available));
+  }
+}
+
+gfx::Rect CalculatePopupBounds(const gfx::Size& desired_size,
+                               const gfx::Rect& content_area_bounds,
+                               const gfx::Rect& element_bounds,
+                               bool is_rtl,
+                               bool horizontally_centered) {
+  gfx::Rect bubble_bounds;
+
+  if (horizontally_centered) {
+    CalculatePopupXAndWidthHorizontallyCentered(
+        desired_size.width(), content_area_bounds, element_bounds, is_rtl,
+        &bubble_bounds);
+  } else {
+    CalculatePopupXAndWidth(desired_size.width(), content_area_bounds,
+                            element_bounds, is_rtl, &bubble_bounds);
+  }
+  CalculatePopupYAndHeight(desired_size.height(), content_area_bounds,
+                           element_bounds, &bubble_bounds);
+
+  return bubble_bounds;
+}
+
 AutofillPopup::AutofillPopup() {
  bold_font_list_ = gfx::FontList().DeriveWithWeight(gfx::Font::Weight::BOLD);
  smaller_font_list_ =
--- a/shell/browser/ui/cocoa/electron_bundle_mover.mm
+++ b/shell/browser/ui/cocoa/electron_bundle_mover.mm
@ -84,7 +84,7 @@ bool ElectronBundleMover::Move(gin_helper::ErrorThrower thrower,
  // Check if we can write to the applications directory
  // and then make sure that if the app already exists we can overwrite it
  bool needAuthorization =
-      ![fileManager isWritableFileAtPath:applicationsDirectory] |
+      ![fileManager isWritableFileAtPath:applicationsDirectory] ||
      ([fileManager fileExistsAtPath:destinationPath] &&
       ![fileManager isWritableFileAtPath:destinationPath]);

--- a/shell/browser/ui/drag_util_views.cc
+++ b/shell/browser/ui/drag_util_views.cc
@ -24,9 +24,8 @@ void DragFileItems(const std::vector<base::FilePath>& files,
  // Set up our OLE machinery
  auto data = std::make_unique<ui::OSExchangeData>();

-  button_drag_utils::SetDragImage(
-      GURL(), files[0].LossyDisplayName(), icon.AsImageSkia(), nullptr,
-      *views::Widget::GetTopLevelWidgetForNativeView(view), data.get());
+  button_drag_utils::SetDragImage(GURL(), files[0].LossyDisplayName(),
+                                  icon.AsImageSkia(), nullptr, data.get());

  std::vector<ui::FileInfo> file_infos;
  file_infos.reserve(files.size());
--- a/shell/browser/ui/inspectable_web_contents.cc
+++ b/shell/browser/ui/inspectable_web_contents.cc
@ -175,9 +175,8 @@ GURL GetDevToolsURL(bool can_dock) {
  return GURL(url_string);
 }

-constexpr base::TimeDelta kInitialBackoffDelay =
-    base::TimeDelta::FromMilliseconds(250);
-constexpr base::TimeDelta kMaxBackoffDelay = base::TimeDelta::FromSeconds(10);
+constexpr base::TimeDelta kInitialBackoffDelay = base::Milliseconds(250);
+constexpr base::TimeDelta kMaxBackoffDelay = base::Seconds(10);

 }  // namespace

@ -954,6 +953,13 @@ void InspectableWebContents::ClearPreferences() {
  sync_disabled_update.Get()->Clear();
 }

+void InspectableWebContents::GetSyncInformation(DispatchCallback callback) {
+  // TODO(anyone): do we want devtool syncing in Electron?
+  base::Value result(base::Value::Type::DICTIONARY);
+  result.SetBoolKey("isSyncActive", false);
+  std::move(callback).Run(&result);
+}
+
 void InspectableWebContents::ConnectionReady() {}

 void InspectableWebContents::RegisterExtensionsAPI(const std::string& origin,
@ -1111,7 +1117,7 @@ void InspectableWebContents::DidFinishNavigation(
      !navigation_handle->HasCommitted())
    return;
  content::RenderFrameHost* frame = navigation_handle->GetRenderFrameHost();
-  auto origin = navigation_handle->GetURL().GetOrigin().spec();
+  auto origin = navigation_handle->GetURL().DeprecatedGetOriginAsURL().spec();
  auto it = extensions_api_.find(origin);
  if (it == extensions_api_.end())
    return;
--- a/shell/browser/ui/inspectable_web_contents.h
+++ b/shell/browser/ui/inspectable_web_contents.h
@ -146,6 +146,7 @@ class InspectableWebContents
                     const std::string& value) override;
  void RemovePreference(const std::string& name) override;
  void ClearPreferences() override;
+  void GetSyncInformation(DispatchCallback callback) override;
  void ConnectionReady() override;
  void RegisterExtensionsAPI(const std::string& origin,
                             const std::string& script) override;
--- a/shell/browser/ui/views/autofill_popup_view.cc
+++ b/shell/browser/ui/views/autofill_popup_view.cc
@ -306,7 +306,7 @@ void AutofillPopupView::OnMouseMoved(const ui::MouseEvent& event) {
  // A synthesized mouse move will be sent when the popup is first shown.
  // Don't preview a suggestion if the mouse happens to be hovering there.
 #if defined(OS_WIN)
-  if (base::Time::Now() - show_time_ <= base::TimeDelta::FromMilliseconds(50))
+  if (base::Time::Now() - show_time_ <= base::Milliseconds(50))
    return;
 #else
  if (event.flags() & ui::EF_IS_SYNTHESIZED)