d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
238 lines
7.8 KiB
C++
238 lines
7.8 KiB
C++
// Copyright (c) 2017 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/renderer/electron_autofill_agent.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "content/public/renderer/render_frame.h"
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
|
#include "third_party/blink/public/common/input/web_keyboard_event.h"
|
|
#include "third_party/blink/public/platform/web_string.h"
|
|
#include "third_party/blink/public/web/web_document.h"
|
|
#include "third_party/blink/public/web/web_local_frame.h"
|
|
#include "third_party/blink/public/web/web_option_element.h"
|
|
#include "ui/events/keycodes/keyboard_codes.h"
|
|
#include "ui/gfx/geometry/rect_f.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
const size_t kMaxStringLength = 1024;
|
|
const size_t kMaxListSize = 512;
|
|
|
|
// Copied from components/autofill/content/renderer/form_autofill_util.cc
|
|
void TrimStringVectorForIPC(std::vector<std::u16string>* strings) {
|
|
// Limit the size of the vector.
|
|
if (strings->size() > kMaxListSize)
|
|
strings->resize(kMaxListSize);
|
|
|
|
// Limit the size of the strings in the vector.
|
|
for (auto& string : *strings) {
|
|
if (string.length() > kMaxStringLength)
|
|
string.resize(kMaxStringLength);
|
|
}
|
|
}
|
|
|
|
// Copied from components/autofill/content/renderer/form_autofill_util.cc.
|
|
void GetDataListSuggestions(const blink::WebInputElement& element,
|
|
std::vector<std::u16string>* values,
|
|
std::vector<std::u16string>* labels) {
|
|
for (const auto& option : element.FilteredDataListOptions()) {
|
|
values->push_back(option.Value().Utf16());
|
|
if (option.Value() != option.Label())
|
|
labels->push_back(option.Label().Utf16());
|
|
else
|
|
labels->push_back(std::u16string());
|
|
}
|
|
|
|
TrimStringVectorForIPC(values);
|
|
TrimStringVectorForIPC(labels);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
AutofillAgent::AutofillAgent(content::RenderFrame* frame,
|
|
blink::AssociatedInterfaceRegistry* registry)
|
|
: content::RenderFrameObserver(frame) {
|
|
render_frame()->GetWebFrame()->SetAutofillClient(this);
|
|
registry->AddInterface<mojom::ElectronAutofillAgent>(base::BindRepeating(
|
|
&AutofillAgent::BindPendingReceiver, base::Unretained(this)));
|
|
}
|
|
|
|
AutofillAgent::~AutofillAgent() = default;
|
|
|
|
void AutofillAgent::BindPendingReceiver(
|
|
mojo::PendingAssociatedReceiver<mojom::ElectronAutofillAgent>
|
|
pending_receiver) {
|
|
receiver_.Bind(std::move(pending_receiver));
|
|
}
|
|
|
|
void AutofillAgent::OnDestruct() {
|
|
Shutdown();
|
|
base::SingleThreadTaskRunner::GetCurrentDefault()->DeleteSoon(FROM_HERE,
|
|
this);
|
|
}
|
|
|
|
void AutofillAgent::Shutdown() {
|
|
receiver_.reset();
|
|
weak_ptr_factory_.InvalidateWeakPtrs();
|
|
}
|
|
|
|
void AutofillAgent::DidChangeScrollOffset() {
|
|
HidePopup();
|
|
}
|
|
|
|
void AutofillAgent::FocusedElementChanged(const blink::WebElement&) {
|
|
focused_node_was_last_clicked_ = false;
|
|
was_focused_before_now_ = false;
|
|
HidePopup();
|
|
}
|
|
|
|
void AutofillAgent::TextFieldDidEndEditing(const blink::WebInputElement&) {
|
|
HidePopup();
|
|
}
|
|
|
|
void AutofillAgent::TextFieldDidChange(
|
|
const blink::WebFormControlElement& element) {
|
|
if (!IsUserGesture() && !render_frame()->IsPasting())
|
|
return;
|
|
|
|
weak_ptr_factory_.InvalidateWeakPtrs();
|
|
base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
|
|
FROM_HERE, base::BindOnce(&AutofillAgent::TextFieldDidChangeImpl,
|
|
weak_ptr_factory_.GetWeakPtr(), element));
|
|
}
|
|
|
|
void AutofillAgent::TextFieldDidChangeImpl(
|
|
const blink::WebFormControlElement& element) {
|
|
ShowSuggestions(element, {.requires_caret_at_end = true});
|
|
}
|
|
|
|
void AutofillAgent::TextFieldDidReceiveKeyDown(
|
|
const blink::WebInputElement& element,
|
|
const blink::WebKeyboardEvent& event) {
|
|
if (event.windows_key_code == ui::VKEY_DOWN ||
|
|
event.windows_key_code == ui::VKEY_UP) {
|
|
ShowSuggestions(element, {.autofill_on_empty_values = true,
|
|
.requires_caret_at_end = true});
|
|
}
|
|
}
|
|
|
|
void AutofillAgent::OpenTextDataListChooser(
|
|
const blink::WebInputElement& element) {
|
|
ShowSuggestions(element, {.autofill_on_empty_values = true});
|
|
}
|
|
|
|
void AutofillAgent::DataListOptionsChanged(
|
|
const blink::WebInputElement& element) {
|
|
if (!element.Focused())
|
|
return;
|
|
|
|
ShowSuggestions(element, {.requires_caret_at_end = true});
|
|
}
|
|
|
|
void AutofillAgent::ShowSuggestions(const blink::WebFormControlElement& element,
|
|
const ShowSuggestionsOptions& options) {
|
|
if (!element.IsEnabled() || element.IsReadOnly())
|
|
return;
|
|
if (!element.SuggestedValue().IsEmpty())
|
|
return;
|
|
|
|
const blink::WebInputElement input_element =
|
|
element.DynamicTo<blink::WebInputElement>();
|
|
if (!input_element.IsNull()) {
|
|
if (!input_element.IsTextField())
|
|
return;
|
|
if (!input_element.SuggestedValue().IsEmpty())
|
|
return;
|
|
}
|
|
|
|
// Don't attempt to autofill with values that are too large or if filling
|
|
// criteria are not met. Keyboard Accessory may still be shown when the
|
|
// |value| is empty, do not attempt to hide it.
|
|
blink::WebString value = element.EditingValue();
|
|
if (value.length() > kMaxStringLength ||
|
|
(!options.autofill_on_empty_values && value.IsEmpty()) ||
|
|
(options.requires_caret_at_end &&
|
|
(element.SelectionStart() != element.SelectionEnd() ||
|
|
element.SelectionEnd() != static_cast<int>(value.length())))) {
|
|
// Any popup currently showing is obsolete.
|
|
HidePopup();
|
|
return;
|
|
}
|
|
|
|
std::vector<std::u16string> data_list_values;
|
|
std::vector<std::u16string> data_list_labels;
|
|
if (!input_element.IsNull()) {
|
|
GetDataListSuggestions(input_element, &data_list_values, &data_list_labels);
|
|
}
|
|
|
|
ShowPopup(element, data_list_values, data_list_labels);
|
|
}
|
|
|
|
void AutofillAgent::DidReceiveLeftMouseDownOrGestureTapInNode(
|
|
const blink::WebNode& node) {
|
|
DCHECK(!node.IsNull());
|
|
focused_node_was_last_clicked_ = node.Focused();
|
|
}
|
|
|
|
void AutofillAgent::DidCompleteFocusChangeInFrame() {
|
|
HandleFocusChangeComplete();
|
|
}
|
|
|
|
bool AutofillAgent::IsUserGesture() const {
|
|
return render_frame()->GetWebFrame()->HasTransientUserActivation();
|
|
}
|
|
|
|
void AutofillAgent::HidePopup() {
|
|
GetAutofillDriver()->HideAutofillPopup();
|
|
}
|
|
|
|
void AutofillAgent::ShowPopup(const blink::WebFormControlElement& element,
|
|
const std::vector<std::u16string>& values,
|
|
const std::vector<std::u16string>& labels) {
|
|
gfx::RectF bounds = render_frame()->ElementBoundsInWindow(element);
|
|
GetAutofillDriver()->ShowAutofillPopup(bounds, values, labels);
|
|
}
|
|
|
|
void AutofillAgent::AcceptDataListSuggestion(const std::u16string& suggestion) {
|
|
auto element = render_frame()->GetWebFrame()->GetDocument().FocusedElement();
|
|
if (element.IsFormControlElement()) {
|
|
blink::WebInputElement input_element =
|
|
element.DynamicTo<blink::WebInputElement>();
|
|
if (!input_element.IsNull())
|
|
input_element.SetAutofillValue(blink::WebString::FromUTF16(suggestion));
|
|
}
|
|
}
|
|
|
|
void AutofillAgent::HandleFocusChangeComplete() {
|
|
auto element = render_frame()->GetWebFrame()->GetDocument().FocusedElement();
|
|
if (element.IsNull() || !element.IsFormControlElement())
|
|
return;
|
|
|
|
if (focused_node_was_last_clicked_ && was_focused_before_now_) {
|
|
blink::WebInputElement input_element =
|
|
element.DynamicTo<blink::WebInputElement>();
|
|
if (!input_element.IsNull())
|
|
ShowSuggestions(input_element, {.autofill_on_empty_values = true});
|
|
}
|
|
|
|
was_focused_before_now_ = true;
|
|
focused_node_was_last_clicked_ = false;
|
|
}
|
|
|
|
const mojo::AssociatedRemote<mojom::ElectronAutofillDriver>&
|
|
AutofillAgent::GetAutofillDriver() {
|
|
if (!autofill_driver_) {
|
|
render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
|
|
&autofill_driver_);
|
|
}
|
|
|
|
return autofill_driver_;
|
|
}
|
|
|
|
} // namespace electron
|