Tom spot Callaway
3 years ago
parent
8dff5fe57e
commit
0834aaae89
@ -0,0 +1,32 @@
|
||||
From f1befebb6cea78950b5a8133bf3e65d56889d353 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Dapena Paz <jdapena@igalia.com>
|
||||
Date: Thu, 20 Jan 2022 09:38:13 +0100
|
||||
Subject: [PATCH] GCC: use braces initialization for NoDestructor in AutofillAssistantModelExecutor
|
||||
|
||||
Fix build with GCC failing to resolve initialization of NoDestructor
|
||||
with initializer list.
|
||||
|
||||
Bug: 819294
|
||||
Change-Id: I5fe8d30b4aefdddd71ff7b220eeffcd838308f5a
|
||||
---
|
||||
|
||||
diff --git a/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc b/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc
|
||||
index 033205b..670376e 100644
|
||||
--- a/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc
|
||||
+++ b/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc
|
||||
@@ -156,13 +156,13 @@
|
||||
// TODO(b/204841212): Implement this with use of ModelMetadata.
|
||||
absl::optional<std::string> AutofillAssistantModelExecutor::Postprocess(
|
||||
const std::vector<const TfLiteTensor*>& output_tensors) {
|
||||
- static const base::NoDestructor<std::vector<std::string>> output_roles(
|
||||
+ static const base::NoDestructor<std::vector<std::string>> output_roles{
|
||||
{"UNKNOWN_ROLE", "NAME_FIRST", "NAME_LAST", "NAME_FULL", "ADDRESS_LINE1",
|
||||
"ADDRESS_LINE2", "CITY", "STATE", "COUNTRY", "POSTAL_CODE",
|
||||
"CREDIT_CARD_NUMBER", "CREDIT_CARD_EXP_MONTH",
|
||||
"CREDIT_CARD_VERIFICATION_CODE", "ORGANIZATION",
|
||||
"CREDIT_CARD_EXPIRATION", "PHONE_NUMBER", "USERNAME_OR_EMAIL",
|
||||
- "CREDIT_CARD_EXP_YEAR"});
|
||||
+ "CREDIT_CARD_EXP_YEAR"}};
|
||||
|
||||
DCHECK_GE(output_tensors.size(), 1u);
|
||||
std::vector<float> data;
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-99.0.4844.51/content/common/user_agent.cc.fedora-user-agent chromium-99.0.4844.51/content/common/user_agent.cc
|
||||
--- chromium-99.0.4844.51/content/common/user_agent.cc.fedora-user-agent 2022-03-04 15:06:27.774789749 +0000
|
||||
+++ chromium-99.0.4844.51/content/common/user_agent.cc 2022-03-04 15:07:22.837911148 +0000
|
||||
@@ -34,7 +34,7 @@ std::string GetUserAgentPlatform() {
|
||||
#elif BUILDFLAG(IS_MAC)
|
||||
return "Macintosh; ";
|
||||
#elif defined(USE_OZONE)
|
||||
- return "X11; "; // strange, but that's what Firefox uses
|
||||
+ return "X11; Fedora; "; // strange, but that's what Firefox uses
|
||||
#elif BUILDFLAG(IS_ANDROID)
|
||||
return "Linux; ";
|
||||
#elif BUILDFLAG(IS_FUCHSIA)
|
||||
@ -0,0 +1,14 @@
|
||||
diff -up chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc.widevine-no-download chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc
|
||||
--- chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc.widevine-no-download 2022-03-04 14:57:16.459599123 +0000
|
||||
+++ chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc 2022-03-04 14:58:39.560763939 +0000
|
||||
@@ -105,10 +105,6 @@ void RegisterComponentsForUpdate() {
|
||||
RegisterMediaFoundationWidevineCdmComponent(cus);
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
||||
- RegisterWidevineCdmComponent(cus);
|
||||
-#endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
||||
-
|
||||
#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_ANDROID)
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
// PNaCl on Chrome OS is on rootfs and there is no need to download it. But
|
||||
Loading…
Reference in new issue