mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 144.0.7543.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * Pass PipScreenCaptureCoordinatorProxy to ScreenCaptureKitDeviceMac https://chromium-review.googlesource.com/c/chromium/src/+/7157590 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: update filenames.libcxx.gni Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 7142359: Spanification of process_singleton_posix.cc https: //chromium-review.googlesource.com/c/chromium/src/+/7142359 Co-Authored-By: Charles Kerr <70381+ckerr@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Move logging::LoggingSettings to base/logging/logging_settings.h https://chromium-review.googlesource.com/c/chromium/src/+/7173024 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 144.0.7545.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 7159368: update PluginService API for sync GetPlugins Upstream removed async PluginService APIs: - GetPluginsAsync() removed, use synchronous GetPlugins() - RegisterInternalPlugin() now takes single argument (remove add_at_beginning) - RefreshPlugins() removed entirely Updated ElectronPluginInfoHostImpl to use synchronous plugin loading and simplified ElectronBrowserMainParts internal plugin registration. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159368 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159328 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159056 (cherry picked from commit88cdf50b0a) Co-authored-by: Samuel Attard <sattard@anthropic.com> * 7159184: add missing base/files/file_path.h include Add explicit include for base/files/file_path.h in electron_browser_context.h. After removal of superfluous Mojo includes from content headers, base::FilePath is no longer transitively included via content/public/browser/browser_context.h. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159184 (cherry picked from commit6ca8ea03ec) Co-authored-by: Samuel Attard <sattard@anthropic.com> * 7126479: add ShouldForceRefreshTextCheckService parameter to SpellCheckClient Upstream added a force-refresh parameter to WebTextCheckClient::RequestCheckingOfText to bypass spell check cache. Add the new ShouldForceRefreshTextCheckService parameter to SpellCheckClient's override (currently unused in Electron). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7126479 (cherry picked from commit879c0401c4) Co-authored-by: Samuel Attard <sattard@anthropic.com> * 7083663: remove fingerprinting_protection_ruleset_service override Upstream deleted external references to Fingerprinting Protection Filter (FPF) component. Remove the fingerprinting_protection_ruleset_service() override from BrowserProcessImpl as the method no longer exists in the base class. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7083663 (cherry picked from commit8350d152f9) Co-authored-by: Samuel Attard <sattard@anthropic.com> * 7155287: implement WebContentsView::GetSize and Resize Upstream delegated WebContents::GetSize() and Resize() to WebContentsView, making them pure virtual. Add const qualifier to GetSize() and implement the Resize() override in OffScreenWebContentsView (no-op for offscreen). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7155287 (cherry picked from commit084eaa568e) Co-authored-by: Samuel Attard <sattard@anthropic.com> * 7184238: add OnUnconfirmedTapConvertedToTap override Upstream added OnUnconfirmedTapConvertedToTap as a pure virtual method to RenderWidgetHostViewBase to inform root view when child frame converts an unconfirmed tap. Add empty override for offscreen rendering. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7184238 (cherry picked from commitef03400d9a) Co-authored-by: Samuel Attard <sattard@anthropic.com> * 7143586: add widget parameter to OnCommandsChanged GlobalAcceleratorListener::OnCommandsChanged gained a gfx::AcceleratedWidget parameter for window association in the GlobalShortcutListenerLinux implementation. Pass gfx::kNullAcceleratedWidget for Electron's usage. Ref: : Pass parent handle to GlobalAcceleratorListenerLinux::BindShortcuts | https://chromium-review.googlesource.com/c/chromium/src/+/7143586 (cherry picked from commit38306e2bfc) Co-Authored-By: Samuel Attard <MarshallOfSound@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@anthropic.com> * chore: update patches Co-Authored-By: Samuel Attard <MarshallOfSound@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 144.0.7547.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 7189232: Add support for UnownedUserData in GlobalFeatures https: //chromium-review.googlesource.com/c/chromium/src/+/7189232 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Refactor: Use std::u16string for extension load error messages https://chromium-review.googlesource.com/c/chromium/src/+/7185844 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * fixup Add support for UnownedUserData in GlobalFeatures Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 7165650: Remove ResourceContext https://chromium-review.googlesource.com/c/chromium/src/+/7165650 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * fixup BUILD.gn for lint Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 7202164: Reland "Reland "Remove GenericScopedHandle:IsValid"" https://chromium-review.googlesource.com/c/chromium/src/+/7202164 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * advance deprecation of v8::ReturnValue<void>::Set(Local<S>). 7168624: [runtime][api] Relax requirements for setter/definer/deleter callbacks | https://chromium-review.googlesource.com/c/v8/v8/+/7168624 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * fixup advance deprecation of v8::ReturnValue<void>::Set(Local<S>) Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: skip setting LPAC ACLs Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Revert "chore: skip setting LPAC ACLs" This reverts commite187aec488. Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> * chore: revert Convert to UNSAFE_TODO in sandbox revert https://chromium-review.googlesource.com/c/chromium/src/+/7131661 to see if it fixes the Windows sandbox issue. Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> * Revert "chore: revert Convert to UNSAFE_TODO in sandbox" This reverts commit57afbfefe5. Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> * chore: Revert "Enable network sandbox by default on Windows" see if this fixes the Windows sandbox issue Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> * Enable network sandbox by default on Windows https://chromium-review.googlesource.com/c/chromium/src/+/7204292 Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> * Revert "chore: Revert "Enable network sandbox by default on Windows"" This reverts commit530ab6af82. Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> * fixup! Enable network sandbox by default on Windows | https://chromium-review.googlesource.com/c/chromium/src/+/7204292 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * fixup!: Correct flag name, add kLocalNetworkAccessChecks to all platforms Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: remove patch that hasn't been backported See https://github.com/electron/electron/pull/48675 --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Samuel Attard <sattard@anthropic.com> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Niklas Wenzel <dev@nikwen.de>
273 lines
9.4 KiB
C++
273 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,
|
|
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
|