mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
274 lines
9.4 KiB
C++
274 lines
9.4 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/renderer/api/electron_api_spell_check_client.h"
|
|
|
|
#include <iterator>
|
|
#include <memory>
|
|
#include <set>
|
|
#include <string_view>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/logging.h"
|
|
#include "base/numerics/safe_conversions.h"
|
|
#include "base/strings/utf_string_conversion_utils.h"
|
|
#include "base/task/single_thread_task_runner.h"
|
|
#include "components/spellcheck/renderer/spellcheck_worditerator.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/function_template.h"
|
|
#include "third_party/abseil-cpp/absl/container/flat_hash_set.h"
|
|
#include "third_party/blink/public/web/web_text_checking_completion.h"
|
|
#include "third_party/blink/public/web/web_text_checking_result.h"
|
|
#include "third_party/icu/source/common/unicode/uscript.h"
|
|
#include "v8/include/v8-function.h"
|
|
|
|
namespace electron::api {
|
|
|
|
namespace {
|
|
|
|
bool HasWordCharacters(const std::u16string& text, size_t index) {
|
|
base_icu::UChar32 code;
|
|
while (index < text.size() &&
|
|
base::ReadUnicodeCharacter(text.c_str(), text.size(), &index, &code)) {
|
|
++index;
|
|
UErrorCode error = U_ZERO_ERROR;
|
|
if (uscript_getScript(code, &error) != USCRIPT_COMMON)
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
struct Word {
|
|
blink::WebTextCheckingResult result;
|
|
std::u16string text;
|
|
std::vector<std::u16string> contraction_words;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
class SpellCheckClient::SpellcheckRequest {
|
|
public:
|
|
SpellcheckRequest(
|
|
const std::u16string& text,
|
|
std::unique_ptr<blink::WebTextCheckingCompletion> completion)
|
|
: text_(text), completion_(std::move(completion)) {}
|
|
SpellcheckRequest(const SpellcheckRequest&) = delete;
|
|
SpellcheckRequest& operator=(const SpellcheckRequest&) = delete;
|
|
~SpellcheckRequest() = default;
|
|
|
|
[[nodiscard]] const std::u16string& text() const { return text_; }
|
|
blink::WebTextCheckingCompletion* completion() { return completion_.get(); }
|
|
std::vector<Word>& wordlist() { return word_list_; }
|
|
|
|
private:
|
|
std::u16string text_; // Text to be checked in this task.
|
|
std::vector<Word> word_list_; // List of Words found in text
|
|
// The interface to send the misspelled ranges to Blink.
|
|
std::unique_ptr<blink::WebTextCheckingCompletion> completion_;
|
|
};
|
|
|
|
SpellCheckClient::SpellCheckClient(const std::string& language,
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Object> provider)
|
|
: isolate_(isolate),
|
|
context_(isolate, isolate->GetCurrentContext()),
|
|
provider_(isolate, provider) {
|
|
DCHECK(!context_.IsEmpty());
|
|
|
|
character_attributes_.SetDefaultLanguage(language);
|
|
|
|
// Persistent the method.
|
|
v8::Local<v8::Function> spell_check;
|
|
gin_helper::Dictionary(isolate, provider).Get("spellCheck", &spell_check);
|
|
spell_check_.Reset(isolate, spell_check);
|
|
}
|
|
|
|
SpellCheckClient::~SpellCheckClient() {
|
|
context_.Reset();
|
|
}
|
|
|
|
void SpellCheckClient::RequestCheckingOfText(
|
|
const blink::WebString& text_to_check,
|
|
const std::vector<blink::WebSpellingMarker>& /* spelling_markers */,
|
|
ShouldForceRefreshTextCheckService /* should_force_refresh */,
|
|
std::unique_ptr<blink::WebTextCheckingCompletion> completion_callback) {
|
|
std::u16string text(text_to_check.Utf16());
|
|
// Ignore invalid requests.
|
|
if (text.empty() || !HasWordCharacters(text, 0)) {
|
|
completion_callback->DidCancelCheckingText();
|
|
return;
|
|
}
|
|
|
|
// Clean up the previous request before starting a new request.
|
|
if (pending_request_param_) {
|
|
pending_request_param_->completion()->DidCancelCheckingText();
|
|
}
|
|
|
|
pending_request_param_ =
|
|
std::make_unique<SpellcheckRequest>(text, std::move(completion_callback));
|
|
|
|
base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
|
|
FROM_HERE, base::BindOnce(&SpellCheckClient::SpellCheckText,
|
|
weak_factory_.GetWeakPtr()));
|
|
}
|
|
|
|
bool SpellCheckClient::IsSpellCheckingEnabled() const {
|
|
return true;
|
|
}
|
|
|
|
bool SpellCheckClient::IsShowingSpellingUI() {
|
|
return false;
|
|
}
|
|
|
|
void SpellCheckClient::SpellCheckText() {
|
|
const auto& text = pending_request_param_->text();
|
|
if (text.empty() || spell_check_.IsEmpty()) {
|
|
pending_request_param_->completion()->DidCancelCheckingText();
|
|
pending_request_param_ = nullptr;
|
|
return;
|
|
}
|
|
|
|
if (!text_iterator_.IsInitialized() &&
|
|
!text_iterator_.Initialize(&character_attributes_, true)) {
|
|
// We failed to initialize text_iterator_, return as spelled correctly.
|
|
VLOG(1) << "Failed to initialize SpellcheckWordIterator";
|
|
return;
|
|
}
|
|
|
|
if (!contraction_iterator_.IsInitialized() &&
|
|
!contraction_iterator_.Initialize(&character_attributes_, false)) {
|
|
// We failed to initialize the word iterator, return as spelled correctly.
|
|
VLOG(1) << "Failed to initialize contraction_iterator_";
|
|
return;
|
|
}
|
|
|
|
text_iterator_.SetText(text);
|
|
|
|
SpellCheckScope scope(*this);
|
|
std::u16string word;
|
|
size_t word_start;
|
|
size_t word_length;
|
|
std::set<std::u16string> words;
|
|
auto& word_list = pending_request_param_->wordlist();
|
|
Word word_entry;
|
|
for (;;) { // Run until end of text
|
|
const auto status =
|
|
text_iterator_.GetNextWord(&word, &word_start, &word_length);
|
|
if (status == SpellcheckWordIterator::IS_END_OF_TEXT)
|
|
break;
|
|
if (status == SpellcheckWordIterator::IS_SKIPPABLE)
|
|
continue;
|
|
|
|
word_entry.result.location = base::checked_cast<int>(word_start);
|
|
word_entry.result.length = base::checked_cast<int>(word_length);
|
|
word_entry.text = word;
|
|
word_entry.contraction_words.clear();
|
|
|
|
word_list.push_back(word_entry);
|
|
words.insert(word);
|
|
// If the given word is a concatenated word of two or more valid words
|
|
// (e.g. "hello:hello"), we should treat it as a valid word.
|
|
if (IsContraction(scope, word, &word_entry.contraction_words)) {
|
|
for (const auto& w : word_entry.contraction_words) {
|
|
words.insert(w);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Send out all the words data to the spellchecker to check
|
|
SpellCheckWords(scope, words);
|
|
}
|
|
|
|
void SpellCheckClient::OnSpellCheckDone(
|
|
const std::vector<std::u16string>& misspelled_words) {
|
|
const absl::flat_hash_set<std::u16string> misspelled{misspelled_words.begin(),
|
|
misspelled_words.end()};
|
|
std::vector<blink::WebTextCheckingResult> results;
|
|
|
|
auto& word_list = pending_request_param_->wordlist();
|
|
|
|
for (const auto& word : word_list) {
|
|
if (misspelled.contains(word.text)) {
|
|
// If this is a contraction, iterate through parts and accept the word
|
|
// if none of them are misspelled
|
|
if (!word.contraction_words.empty()) {
|
|
auto all_correct = true;
|
|
for (const auto& contraction_word : word.contraction_words) {
|
|
if (misspelled.contains(contraction_word)) {
|
|
all_correct = false;
|
|
break;
|
|
}
|
|
}
|
|
if (all_correct)
|
|
continue;
|
|
}
|
|
results.push_back(word.result);
|
|
}
|
|
}
|
|
pending_request_param_->completion()->DidFinishCheckingText(results);
|
|
pending_request_param_ = nullptr;
|
|
}
|
|
|
|
void SpellCheckClient::SpellCheckWords(const SpellCheckScope& scope,
|
|
const std::set<std::u16string>& words) {
|
|
DCHECK(!scope.spell_check_.IsEmpty());
|
|
|
|
auto context = isolate_->GetCurrentContext();
|
|
v8::MicrotasksScope microtasks_scope(
|
|
context, v8::MicrotasksScope::kDoNotRunMicrotasks);
|
|
|
|
v8::Local<v8::FunctionTemplate> templ = gin_helper::CreateFunctionTemplate(
|
|
isolate_, base::BindRepeating(&SpellCheckClient::OnSpellCheckDone,
|
|
weak_factory_.GetWeakPtr()));
|
|
v8::Local<v8::Value> args[] = {gin::ConvertToV8(isolate_, words),
|
|
templ->GetFunction(context).ToLocalChecked()};
|
|
// Call javascript with the words and the callback function
|
|
scope.spell_check_->Call(context, scope.provider_, std::size(args), args)
|
|
.IsEmpty();
|
|
}
|
|
|
|
// Returns whether or not the given string is a contraction.
|
|
// This function is a fall-back when the SpellcheckWordIterator class
|
|
// returns a concatenated word which is not in the selected dictionary
|
|
// (e.g. "in'n'out") but each word is valid.
|
|
// Output variable contraction_words will contain individual
|
|
// words in the contraction.
|
|
bool SpellCheckClient::IsContraction(
|
|
const SpellCheckScope& scope,
|
|
const std::u16string& contraction,
|
|
std::vector<std::u16string>* contraction_words) {
|
|
DCHECK(contraction_iterator_.IsInitialized());
|
|
|
|
contraction_iterator_.SetText(contraction);
|
|
|
|
std::u16string word;
|
|
size_t word_start;
|
|
size_t word_length;
|
|
for (auto status =
|
|
contraction_iterator_.GetNextWord(&word, &word_start, &word_length);
|
|
status != SpellcheckWordIterator::IS_END_OF_TEXT;
|
|
status = contraction_iterator_.GetNextWord(&word, &word_start,
|
|
&word_length)) {
|
|
if (status == SpellcheckWordIterator::IS_SKIPPABLE)
|
|
continue;
|
|
|
|
contraction_words->push_back(word);
|
|
}
|
|
return contraction_words->size() > 1;
|
|
}
|
|
|
|
SpellCheckClient::SpellCheckScope::SpellCheckScope(
|
|
const SpellCheckClient& client)
|
|
: handle_scope_(client.isolate_),
|
|
context_scope_(
|
|
v8::Local<v8::Context>::New(client.isolate_, client.context_)),
|
|
provider_(v8::Local<v8::Object>::New(client.isolate_, client.provider_)),
|
|
spell_check_(
|
|
v8::Local<v8::Function>::New(client.isolate_, client.spell_check_)) {}
|
|
|
|
SpellCheckClient::SpellCheckScope::~SpellCheckScope() = default;
|
|
|
|
} // namespace electron::api
|