a006cf681b
* chore: bump chromium in DEPS to 91.0.4435.3 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 * chore: update patches * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 * chore: update patches * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 * chore: remove deleted file from chromium_src list * chore: fix lint * update patches * chore: bump chromium in DEPS to 91.0.4438.0 * chore: bump chromium in DEPS to 91.0.4439.0 * chore: bump chromium in DEPS to 91.0.4440.0 * chore: bump chromium in DEPS to 91.0.4441.0 * chore: bump chromium in DEPS to 91.0.4442.0 * chore: bump chromium in DEPS to 91.0.4443.0 * chore: bump chromium in DEPS to 91.0.4445.0 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: update patches * fixup gn check * Merge branch 'master' into roller/chromium/master * update to xcode 12.4.0 Needed because of8008deb41c
* 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 * chore: bump chromium in DEPS to 91.0.4448.0 * Update patches * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * only include mac notifications on mac * add additional skipping of atk toolchain check * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 * Fixup 2721718: Move HostID to extensions::mojom::HostID * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() * update node headers * chore: bump chromium in DEPS to 91.0.4449.0 * Revert "chore: bump chromium in DEPS to 91.0.4449.0" This reverts commitbccafa0289
. * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build * fix StrCat issue * incantations for WebContentsPreferences::GetPreloadPath wide strings * bump nan * fix GetAsString maybe? * windows build fixes * more windows build fix * SetAppUserModelID -> wstring * upgrade nan dep in tests * lint * wstrings are cross-platform * linter * only bind setAppUserModelId on windows * fix a messed up merge * well that was an odyssey * backport fcdf35e from v8 to fix nan crash * disable typedarrays-test.js * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 * use PartitionAllocator for ArrayBuffers in the main process * fix patches * chore: omit some unnecessary conversions * refactor: make LoginItemSettings::path a wstring * refactor: make ShowTaskDialog take a wstr * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b
. Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
208 lines
6 KiB
C++
208 lines
6 KiB
C++
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include <algorithm>
|
|
#include <memory>
|
|
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/i18n/rtl.h"
|
|
#include "chrome/browser/ui/views/autofill/autofill_popup_view_utils.h"
|
|
#include "electron/buildflags/buildflags.h"
|
|
#include "mojo/public/cpp/bindings/associated_remote.h"
|
|
#include "shell/browser/native_window_views.h"
|
|
#include "shell/browser/ui/autofill_popup.h"
|
|
#include "shell/common/api/api.mojom.h"
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
|
#include "ui/display/display.h"
|
|
#include "ui/display/screen.h"
|
|
#include "ui/gfx/geometry/point.h"
|
|
#include "ui/gfx/geometry/rect.h"
|
|
#include "ui/gfx/geometry/rect_conversions.h"
|
|
#include "ui/gfx/geometry/vector2d.h"
|
|
#include "ui/gfx/text_utils.h"
|
|
|
|
#if BUILDFLAG(ENABLE_OSR)
|
|
#include "shell/browser/osr/osr_render_widget_host_view.h"
|
|
#include "shell/browser/osr/osr_view_proxy.h"
|
|
#endif
|
|
|
|
namespace electron {
|
|
|
|
AutofillPopup::AutofillPopup() {
|
|
bold_font_list_ = gfx::FontList().DeriveWithWeight(gfx::Font::Weight::BOLD);
|
|
smaller_font_list_ =
|
|
gfx::FontList().DeriveWithSizeDelta(kSmallerFontSizeDelta);
|
|
}
|
|
|
|
AutofillPopup::~AutofillPopup() {
|
|
Hide();
|
|
}
|
|
|
|
void AutofillPopup::CreateView(content::RenderFrameHost* frame_host,
|
|
content::RenderFrameHost* embedder_frame_host,
|
|
bool offscreen,
|
|
views::View* parent,
|
|
const gfx::RectF& r) {
|
|
Hide();
|
|
|
|
frame_host_ = frame_host;
|
|
element_bounds_ = gfx::ToEnclosedRect(r);
|
|
|
|
gfx::Vector2d height_offset(0, element_bounds_.height());
|
|
gfx::Point menu_position(element_bounds_.origin() + height_offset);
|
|
views::View::ConvertPointToScreen(parent, &menu_position);
|
|
popup_bounds_ = gfx::Rect(menu_position, element_bounds_.size());
|
|
|
|
parent_ = parent;
|
|
parent_->AddObserver(this);
|
|
|
|
view_ = new AutofillPopupView(this, parent->GetWidget());
|
|
|
|
#if BUILDFLAG(ENABLE_OSR)
|
|
if (offscreen) {
|
|
auto* rwhv = frame_host->GetView();
|
|
if (embedder_frame_host != nullptr) {
|
|
rwhv = embedder_frame_host->GetView();
|
|
}
|
|
|
|
auto* osr_rwhv = static_cast<OffScreenRenderWidgetHostView*>(rwhv);
|
|
view_->view_proxy_ = std::make_unique<OffscreenViewProxy>(view_);
|
|
osr_rwhv->AddViewProxy(view_->view_proxy_.get());
|
|
}
|
|
#endif
|
|
|
|
// Do this after OSR setup, we check for view_proxy_ when showing
|
|
view_->Show();
|
|
}
|
|
|
|
void AutofillPopup::Hide() {
|
|
if (parent_) {
|
|
parent_->RemoveObserver(this);
|
|
parent_ = nullptr;
|
|
}
|
|
if (view_) {
|
|
view_->Hide();
|
|
view_ = nullptr;
|
|
}
|
|
}
|
|
|
|
void AutofillPopup::SetItems(const std::vector<std::u16string>& values,
|
|
const std::vector<std::u16string>& labels) {
|
|
DCHECK(view_);
|
|
values_ = values;
|
|
labels_ = labels;
|
|
UpdatePopupBounds();
|
|
view_->OnSuggestionsChanged();
|
|
if (view_) // could be hidden after the change
|
|
view_->DoUpdateBoundsAndRedrawPopup();
|
|
}
|
|
|
|
void AutofillPopup::AcceptSuggestion(int index) {
|
|
mojo::AssociatedRemote<mojom::ElectronAutofillAgent> autofill_agent;
|
|
frame_host_->GetRemoteAssociatedInterfaces()->GetInterface(&autofill_agent);
|
|
autofill_agent->AcceptDataListSuggestion(GetValueAt(index));
|
|
}
|
|
|
|
void AutofillPopup::UpdatePopupBounds() {
|
|
DCHECK(parent_);
|
|
gfx::Point origin(element_bounds_.origin());
|
|
views::View::ConvertPointToScreen(parent_, &origin);
|
|
|
|
gfx::Rect bounds(origin, element_bounds_.size());
|
|
gfx::Rect window_bounds = parent_->GetBoundsInScreen();
|
|
|
|
gfx::Size preferred_size =
|
|
gfx::Size(GetDesiredPopupWidth(), GetDesiredPopupHeight());
|
|
popup_bounds_ = CalculatePopupBounds(preferred_size, window_bounds, bounds,
|
|
base::i18n::IsRTL());
|
|
}
|
|
|
|
gfx::Rect AutofillPopup::popup_bounds_in_view() {
|
|
gfx::Point origin(popup_bounds_.origin());
|
|
views::View::ConvertPointFromScreen(parent_, &origin);
|
|
|
|
return gfx::Rect(origin, popup_bounds_.size());
|
|
}
|
|
|
|
void AutofillPopup::OnViewBoundsChanged(views::View* view) {
|
|
UpdatePopupBounds();
|
|
view_->DoUpdateBoundsAndRedrawPopup();
|
|
}
|
|
|
|
void AutofillPopup::OnViewIsDeleting(views::View* view) {
|
|
Hide();
|
|
}
|
|
|
|
int AutofillPopup::GetDesiredPopupHeight() {
|
|
return 2 * kPopupBorderThickness + values_.size() * kRowHeight;
|
|
}
|
|
|
|
int AutofillPopup::GetDesiredPopupWidth() {
|
|
int popup_width = element_bounds_.width();
|
|
|
|
for (size_t i = 0; i < values_.size(); ++i) {
|
|
int row_size =
|
|
kEndPadding + 2 * kPopupBorderThickness +
|
|
gfx::GetStringWidth(GetValueAt(i), GetValueFontListForRow(i)) +
|
|
gfx::GetStringWidth(GetLabelAt(i), GetLabelFontListForRow(i));
|
|
if (!GetLabelAt(i).empty())
|
|
row_size += kNamePadding + kEndPadding;
|
|
|
|
popup_width = std::max(popup_width, row_size);
|
|
}
|
|
|
|
return popup_width;
|
|
}
|
|
|
|
gfx::Rect AutofillPopup::GetRowBounds(int index) {
|
|
int top = kPopupBorderThickness + index * kRowHeight;
|
|
|
|
return gfx::Rect(kPopupBorderThickness, top,
|
|
popup_bounds_.width() - 2 * kPopupBorderThickness,
|
|
kRowHeight);
|
|
}
|
|
|
|
const gfx::FontList& AutofillPopup::GetValueFontListForRow(int index) const {
|
|
return bold_font_list_;
|
|
}
|
|
|
|
const gfx::FontList& AutofillPopup::GetLabelFontListForRow(int index) const {
|
|
return smaller_font_list_;
|
|
}
|
|
|
|
ui::NativeTheme::ColorId AutofillPopup::GetBackgroundColorIDForRow(
|
|
int index) const {
|
|
return (view_ && index == view_->GetSelectedLine())
|
|
? ui::NativeTheme::kColorId_ResultsTableHoveredBackground
|
|
: ui::NativeTheme::kColorId_ResultsTableNormalBackground;
|
|
}
|
|
|
|
int AutofillPopup::GetLineCount() {
|
|
return values_.size();
|
|
}
|
|
|
|
std::u16string AutofillPopup::GetValueAt(int i) {
|
|
return values_.at(i);
|
|
}
|
|
|
|
std::u16string AutofillPopup::GetLabelAt(int i) {
|
|
return labels_.at(i);
|
|
}
|
|
|
|
int AutofillPopup::LineFromY(int y) const {
|
|
int current_height = kPopupBorderThickness;
|
|
|
|
for (size_t i = 0; i < values_.size(); ++i) {
|
|
current_height += kRowHeight;
|
|
|
|
if (y <= current_height)
|
|
return i;
|
|
}
|
|
|
|
return values_.size() - 1;
|
|
}
|
|
|
|
} // namespace electron
|