chore: bump chromium to 91.0.4448.0 (13-x-y) (#28127)

* chore: bump chromium in DEPS to 90.0.4430.19 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 (cherry picked from commit b820b4078d) * chore: bump chromium in DEPS to 91.0.4441.0 * chore: update patches (cherry picked from commit 55e50a0879) * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 (cherry picked from commit e715b9c921) * chore: update patches (cherry picked from commit c8148febfa) * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commit 87df2766ba) * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 (cherry picked from commit e900271bea) * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 (cherry picked from commit eccfa516c5) * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 (cherry picked from commit 2fed02556d) * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 (cherry picked from commit 0d94e0d1d9) * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commit 1a296e59c2) * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commit dc36e8e6fc) * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 (cherry picked from commit 59669e99cb) * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commit be627568b2) * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 (cherry picked from commit 77ad17b383) * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 (cherry picked from commit 4e02d9407a) * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 (cherry picked from commit f51f427646) * chore: remove deleted file from chromium_src list (cherry picked from commit 59432fe30a) * chore: fix lint (cherry picked from commit 54cc68dd7a) * update patches (cherry picked from commit e99e6a5a8a) * chore: update patches (cherry picked from commit 1e16606524) * fixup gn check (cherry picked from commit 8f4e362d8f) * update to xcode 12.4.0 Needed because of 8008deb41c (cherry picked from commit fae4d87a5a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commit d4bec23bde) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commit 9e336f5d0c) * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 (cherry picked from commit 08036802cb) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit 676f74f3dc) * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 (cherry picked from commit 76538d2d38) * chore: bump chromium in DEPS to 90.0.4430.19 * chore: bump chromium in DEPS to 90.0.4430.30 * chore: bump chromium in DEPS to 90.0.4430.40 * chore: bump chromium in DEPS to 90.0.4430.51 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: bump chromium in DEPS to 91.0.4448.0 (cherry picked from commit 003dd6c16c) * Update patches (cherry picked from commit 9f5e3f6685) * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 (cherry picked from commit b15b820bca) * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 (cherry picked from commit 185c343b22) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit 88bbe2a352) * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 (cherry picked from commit 3010dd93e3) * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 (cherry picked from commit d54bee03d0) * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target (cherry picked from commit 5fc298ee5f) * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 (cherry picked from commit 2cd53eb46a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commit f1bb6be4b9) * only include mac notifications on mac (cherry picked from commit 3160e608e2) * add additional skipping of atk toolchain check (cherry picked from commit 86d23cee40) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit 22d8f22cfb) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit ec893f8322) * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 (cherry picked from commit d0989802bd) * Fixup 2721718: Move HostID to extensions::mojom::HostID (cherry picked from commit 29dfabadfd) * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer (cherry picked from commit 97b6868e9c) * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui (cherry picked from commit b6d2ae0455) * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() (cherry picked from commit 7e961d8a37) * update node headers (cherry picked from commit c49bc282d5) * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 (cherry picked from commit 3b183854ff) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit 2d3c65beca) * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build (cherry picked from commit deeb2de14b) * fix StrCat issue (cherry picked from commit 451e0931bf) * incantations for WebContentsPreferences::GetPreloadPath wide strings (cherry picked from commit 205f572181) * bump nan (cherry picked from commit 74318705c2) * fix GetAsString maybe? (cherry picked from commit ea62ecd188) * windows build fixes (cherry picked from commit 5b598037bb) * more windows build fix (cherry picked from commit 61cf1abd4d) * SetAppUserModelID -> wstring (cherry picked from commit 83d93bcbdc) * upgrade nan dep in tests (cherry picked from commit 4f97b9303c) * update patch * wstrings are cross-platform (cherry picked from commit 7f7b1f6c8a) * linter (cherry picked from commit aaf03765ed) * only bind setAppUserModelId on windows (cherry picked from commit 640a145112) * well that was an odyssey (cherry picked from commit dd975328a0) * backport fcdf35e from v8 to fix nan crash (cherry picked from commit 606fd87d1e) * disable typedarrays-test.js (cherry picked from commit 01ca00ec82) * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 (cherry picked from commit 3122820e58) * use PartitionAllocator for ArrayBuffers in the main process (cherry picked from commit 1f575ca3af) * fix patches (cherry picked from commit 54e72fa8e3) * chore: omit some unnecessary conversions (cherry picked from commit 0f3620099a) * refactor: make LoginItemSettings::path a wstring (cherry picked from commit 9127cff58b) * refactor: make ShowTaskDialog take a wstr (cherry picked from commit 1594c54933) * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit 9127cff58b. (cherry picked from commit 9684d85101) * fixup patches This reverts commit 0cc08813a6. * update patches after merge 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: Charles Kerr <charles@charleskerr.com>
2026-04-10 03:01:51 -04:00 · 2021-04-13 08:29:10 -07:00
parent 1f95fdd5ca
commit 66a2218723
233 changed files with 1577 additions and 1508 deletions
--- a/shell/renderer/api/electron_api_spell_check_client.cc
+++ b/shell/renderer/api/electron_api_spell_check_client.cc
@@ -28,8 +28,8 @@ namespace api {

 namespace {

-bool HasWordCharacters(const base::string16& text, int index) {
-  const base::char16* data = text.data();
+bool HasWordCharacters(const std::u16string& text, int index) {
+  const char16_t* data = text.data();
  int length = text.length();
  while (index < length) {
    uint32_t code = 0;
@@ -43,8 +43,8 @@ bool HasWordCharacters(const base::string16& text, int index) {

 struct Word {
  blink::WebTextCheckingResult result;
-  base::string16 text;
-  std::vector<base::string16> contraction_words;
+  std::u16string text;
+  std::vector<std::u16string> contraction_words;
 };

 }  // namespace
@@ -52,19 +52,19 @@ struct Word {
 class SpellCheckClient::SpellcheckRequest {
 public:
  SpellcheckRequest(
-      const base::string16& text,
+      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;

-  const base::string16& text() const { return text_; }
+  const std::u16string& text() const { return text_; }
  blink::WebTextCheckingCompletion* completion() { return completion_.get(); }
  std::vector<Word>& wordlist() { return word_list_; }

 private:
-  base::string16 text_;          // Text to be checked in this task.
+  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 WebKit.
  std::unique_ptr<blink::WebTextCheckingCompletion> completion_;
@@ -93,7 +93,7 @@ SpellCheckClient::~SpellCheckClient() {
 void SpellCheckClient::RequestCheckingOfText(
    const blink::WebString& textToCheck,
    std::unique_ptr<blink::WebTextCheckingCompletion> completionCallback) {
-  base::string16 text(textToCheck.Utf16());
+  std::u16string text(textToCheck.Utf16());
  // Ignore invalid requests.
  if (text.empty() || !HasWordCharacters(text, 0)) {
    completionCallback->DidCancelCheckingText();
@@ -151,10 +151,10 @@ void SpellCheckClient::SpellCheckText() {
  text_iterator_.SetText(text.c_str(), text.size());

  SpellCheckScope scope(*this);
-  base::string16 word;
+  std::u16string word;
  size_t word_start;
  size_t word_length;
-  std::set<base::string16> words;
+  std::set<std::u16string> words;
  auto& word_list = pending_request_param_->wordlist();
  Word word_entry;
  for (;;) {  // Run until end of text
@@ -186,9 +186,9 @@ void SpellCheckClient::SpellCheckText() {
 }

 void SpellCheckClient::OnSpellCheckDone(
-    const std::vector<base::string16>& misspelled_words) {
+    const std::vector<std::u16string>& misspelled_words) {
  std::vector<blink::WebTextCheckingResult> results;
-  std::unordered_set<base::string16> misspelled(misspelled_words.begin(),
+  std::unordered_set<std::u16string> misspelled(misspelled_words.begin(),
                                                misspelled_words.end());

  auto& word_list = pending_request_param_->wordlist();
@@ -216,7 +216,7 @@ void SpellCheckClient::OnSpellCheckDone(
 }

 void SpellCheckClient::SpellCheckWords(const SpellCheckScope& scope,
-                                       const std::set<base::string16>& words) {
+                                       const std::set<std::u16string>& words) {
  DCHECK(!scope.spell_check_.IsEmpty());

  v8::Local<v8::FunctionTemplate> templ = gin_helper::CreateFunctionTemplate(
@@ -238,13 +238,13 @@ void SpellCheckClient::SpellCheckWords(const SpellCheckScope& scope,
 // words in the contraction.
 bool SpellCheckClient::IsContraction(
    const SpellCheckScope& scope,
-    const base::string16& contraction,
-    std::vector<base::string16>* contraction_words) {
+    const std::u16string& contraction,
+    std::vector<std::u16string>* contraction_words) {
  DCHECK(contraction_iterator_.IsInitialized());

  contraction_iterator_.SetText(contraction.c_str(), contraction.length());

-  base::string16 word;
+  std::u16string word;
  size_t word_start;
  size_t word_length;
  for (auto status =
--- a/shell/renderer/api/electron_api_spell_check_client.h
+++ b/shell/renderer/api/electron_api_spell_check_client.h
@@ -69,18 +69,18 @@ class SpellCheckClient : public blink::WebSpellCheckPanelHostClient,
  // The javascript function will callback OnSpellCheckDone
  // with the results of all the misspelled words.
  void SpellCheckWords(const SpellCheckScope& scope,
-                       const std::set<base::string16>& words);
+                       const std::set<std::u16string>& words);

  // Returns whether or not the given word is a contraction of valid words
  // (e.g. "word:word").
  // Output variable contraction_words will contain individual
  // words in the contraction.
  bool IsContraction(const SpellCheckScope& scope,
-                     const base::string16& word,
-                     std::vector<base::string16>* contraction_words);
+                     const std::u16string& word,
+                     std::vector<std::u16string>* contraction_words);

  // Callback for the JS API which returns the list of misspelled words.
-  void OnSpellCheckDone(const std::vector<base::string16>& misspelled_words);
+  void OnSpellCheckDone(const std::vector<std::u16string>& misspelled_words);

  // Represents character attributes used for filtering out characters which
  // are not supported by this SpellCheck object.
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -114,7 +114,7 @@ content::RenderFrame* GetRenderFrame(v8::Local<v8::Value> value) {
 bool SpellCheckWord(v8::Isolate* isolate,
                    v8::Local<v8::Value> window,
                    const std::string& word,
-                    std::vector<base::string16>* optional_suggestions) {
+                    std::vector<std::u16string>* optional_suggestions) {
  size_t start;
  size_t length;

@@ -123,7 +123,7 @@ bool SpellCheckWord(v8::Isolate* isolate,
  if (!render_frame)
    return true;

-  base::string16 w = base::UTF8ToUTF16(word);
+  std::u16string w = base::UTF8ToUTF16(word);
  int id = render_frame->GetRoutingID();
  return client->GetSpellCheck()->SpellCheckWord(
      w.c_str(), 0, word.size(), id, &start, &length, optional_suggestions);
@@ -580,7 +580,7 @@ void InsertText(gin_helper::ErrorThrower thrower,
  }
 }

-base::string16 InsertCSS(v8::Local<v8::Value> window,
+std::u16string InsertCSS(v8::Local<v8::Value> window,
                         const std::string& css,
                         gin_helper::Arguments* args) {
  blink::WebDocument::CSSOrigin css_origin =
@@ -595,7 +595,7 @@ base::string16 InsertCSS(v8::Local<v8::Value> window,
    args->ThrowError(
        "Render frame was torn down before webFrame.insertCSS could be "
        "executed");
-    return base::string16();
+    return std::u16string();
  }

  blink::WebFrame* web_frame = render_frame->GetWebFrame();
@@ -605,12 +605,12 @@ base::string16 InsertCSS(v8::Local<v8::Value> window,
        .InsertStyleSheet(blink::WebString::FromUTF8(css), nullptr, css_origin)
        .Utf16();
  }
-  return base::string16();
+  return std::u16string();
 }

 void RemoveInsertedCSS(gin_helper::ErrorThrower thrower,
                       v8::Local<v8::Value> window,
-                       const base::string16& key) {
+                       const std::u16string& key) {
  auto* render_frame = GetRenderFrame(window);
  if (!render_frame) {
    thrower.ThrowError(
@@ -628,7 +628,7 @@ void RemoveInsertedCSS(gin_helper::ErrorThrower thrower,

 v8::Local<v8::Promise> ExecuteJavaScript(gin_helper::Arguments* args,
                                         v8::Local<v8::Value> window,
-                                         const base::string16& code) {
+                                         const std::u16string& code) {
  v8::Isolate* isolate = args->isolate();
  gin_helper::Promise<v8::Local<v8::Value>> promise(isolate);
  v8::Local<v8::Promise> handle = promise.GetHandle();
@@ -689,8 +689,8 @@ v8::Local<v8::Promise> ExecuteJavaScriptInIsolatedWorld(
  std::vector<blink::WebScriptSource> sources;

  for (const auto& script : scripts) {
-    base::string16 code;
-    base::string16 url;
+    std::u16string code;
+    std::u16string url;
    int start_line = 1;
    script.Get("url", &url);
    script.Get("startLine", &start_line);
@@ -770,10 +770,10 @@ bool IsWordMisspelled(v8::Isolate* isolate,
  return !SpellCheckWord(isolate, window, word, nullptr);
 }

-std::vector<base::string16> GetWordSuggestions(v8::Isolate* isolate,
+std::vector<std::u16string> GetWordSuggestions(v8::Isolate* isolate,
                                               v8::Local<v8::Value> window,
                                               const std::string& word) {
-  std::vector<base::string16> suggestions;
+  std::vector<std::u16string> suggestions;
  SpellCheckWord(isolate, window, word, &suggestions);
  return suggestions;
 }
--- a/shell/renderer/electron_autofill_agent.cc
+++ b/shell/renderer/electron_autofill_agent.cc
@@ -25,18 +25,18 @@ const size_t kMaxDataLength = 1024;
 const size_t kMaxListSize = 512;

 void GetDataListSuggestions(const blink::WebInputElement& element,
-                            std::vector<base::string16>* values,
-                            std::vector<base::string16>* labels) {
+                            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(base::string16());
+      labels->push_back(std::u16string());
  }
 }

-void TrimStringVectorForIPC(std::vector<base::string16>* strings) {
+void TrimStringVectorForIPC(std::vector<std::u16string>* strings) {
  // Limit the size of the vector.
  if (strings->size() > kMaxListSize)
    strings->resize(kMaxListSize);
@@ -152,8 +152,8 @@ void AutofillAgent::ShowSuggestions(const blink::WebFormControlElement& element,
    return;
  }

-  std::vector<base::string16> data_list_values;
-  std::vector<base::string16> data_list_labels;
+  std::vector<std::u16string> data_list_values;
+  std::vector<std::u16string> data_list_labels;
  if (input_element) {
    GetDataListSuggestions(*input_element, &data_list_values,
                           &data_list_labels);
@@ -182,13 +182,13 @@ void AutofillAgent::HidePopup() {
 }

 void AutofillAgent::ShowPopup(const blink::WebFormControlElement& element,
-                              const std::vector<base::string16>& values,
-                              const std::vector<base::string16>& labels) {
+                              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 base::string16& suggestion) {
+void AutofillAgent::AcceptDataListSuggestion(const std::u16string& suggestion) {
  auto element = render_frame()->GetWebFrame()->GetDocument().FocusedElement();
  if (element.IsFormControlElement()) {
    ToWebInputElement(&element)->SetAutofillValue(
--- a/shell/renderer/electron_autofill_agent.h
+++ b/shell/renderer/electron_autofill_agent.h
@@ -58,13 +58,13 @@ class AutofillAgent : public content::RenderFrameObserver,
  void DataListOptionsChanged(const blink::WebInputElement&) override;

  // mojom::ElectronAutofillAgent
-  void AcceptDataListSuggestion(const base::string16& suggestion) override;
+  void AcceptDataListSuggestion(const std::u16string& suggestion) override;

  bool IsUserGesture() const;
  void HidePopup();
  void ShowPopup(const blink::WebFormControlElement&,
-                 const std::vector<base::string16>&,
-                 const std::vector<base::string16>&);
+                 const std::vector<std::u16string>&,
+                 const std::vector<std::u16string>&);
  void ShowSuggestions(const blink::WebFormControlElement& element,
                       const ShowSuggestionsOptions& options);

--- a/shell/renderer/electron_render_frame_observer.h
+++ b/shell/renderer/electron_render_frame_observer.h
@@ -7,7 +7,6 @@

 #include <string>

-#include "base/strings/string16.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "ipc/ipc_platform_file.h"
 #include "shell/renderer/renderer_client_base.h"
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -222,7 +222,7 @@ void RendererClientBase::RenderThreadStarted() {

 #if defined(OS_WIN)
  // Set ApplicationUserModelID in renderer process.
-  base::string16 app_id =
+  std::wstring app_id =
      command_line->GetSwitchValueNative(switches::kAppUserModelId);
  if (!app_id.empty()) {
    SetCurrentProcessExplicitAppUserModelID(app_id.c_str());