[M120][Tizen][Onscreen] Fix build errors for TV profile 00/304100/13
authorv-saha <v.saha@samsung.com>
Tue, 23 Jan 2024 21:18:04 +0000 (02:48 +0530)
committerDae-Hyun Ko <dhyuna.ko@samsung.com>
Fri, 26 Jan 2024 00:48:51 +0000 (00:48 +0000)
This patch fixes TV Onscreen build issues for M120.

Change-Id: I779c25f22364f863fe08b352b628e1cb24d68d9c
Signed-off-by: venu.musham <venu.musham@samsung.com>
Signed-off-by: v-saha <v.saha@samsung.com>
64 files changed:
build/config/linux/libffi/BUILD.gn
chrome.sh
chrome/BUILD.gn
chrome/browser/BUILD.gn
chrome/browser/browser_process_impl.cc
chrome/browser/chrome_browser_main.cc
chrome/browser/chrome_browser_main_linux.cc
chrome/browser/content_settings/one_time_permission_provider.h
chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc
chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
chrome/browser/extensions/pref_mapping.cc
chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
chrome/browser/net/system_network_context_manager.cc
chrome/browser/ui/BUILD.gn
chrome/browser/ui/location_bar/location_bar.h
chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
chrome/browser/ui/safety_hub/menu_notification_service.h
chrome/browser/ui/tabs/supports_handles.h
chrome/browser/ui/views/permissions/embedded_permission_prompt_base_view.h
chrome/browser/ui/views/tabs/tab_style_views.cc
chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.cc
chrome/browser/ui/webui/realbox/realbox_handler.cc
chrome/browser/ui/webui/sandbox/sandbox_internals_ui.cc
chrome/browser/web_applications/isolated_web_apps/update_manifest/update_manifest.cc
chrome/browser/web_applications/isolated_web_apps/update_manifest/update_manifest.h
chrome/browser/web_applications/web_app.cc
chrome/browser/web_applications/web_app.h
chrome/browser/webauthn/authenticator_request_dialog_model.cc
chrome/browser/webauthn/authenticator_request_dialog_model.h
components/autofill/content/renderer/password_autofill_agent.cc
components/cloud_devices/common/printer_description.cc
components/cloud_devices/common/printer_description.h
components/crash/core/app/crashpad_handler_main.cc
components/feedback/redaction_tool/validation.cc
components/omnibox/browser/autocomplete_classifier.cc
components/optimization_guide/core/tflite_model_executor.h
components/optimization_guide/features.gni
components/os_crypt/sync/BUILD.gn
components/policy/core/common/BUILD.gn
components/policy/core/common/schema.cc
components/power_metrics/BUILD.gn
components/stability_report/user_stream_data_source.cc
components/stability_report/user_stream_data_source.h
components/stability_report/user_stream_data_source_posix.cc
components/storage_monitor/BUILD.gn
components/supervised_user/buildflags.gni
components/supervised_user/core/browser/proto_fetcher.cc
components/supervised_user/core/browser/proto_fetcher.h
content/browser/renderer_host/render_process_host_impl.cc
content/public/test/fake_render_widget_host.cc
content/public/test/fake_render_widget_host.h
packaging/chromium-efl.spec
pdf/features.gni
printing/buildflags/buildflags.gni
services/device/geolocation/location_arbitrator.cc
third_party/crashpad/crashpad/minidump/minidump_extensions.h
third_party/eigen3/src/Eigen/src/Core/util/Memory.h
third_party/eigen3/src/Eigen/src/Core/util/Meta.h
third_party/flatbuffers/src/include/flatbuffers/stl_emulation.h
third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp
tizen_src/chromium_impl/ui/ozone/platform/efl/efl_event_handler.cc
tizen_src/chromium_impl/ui/ozone/platform/efl/im_context_efl.cc
ui/base/wayland/color_manager_util.h
ui/ozone/platform/wayland/BUILD.gn

index 771170c..7052491 100644 (file)
@@ -3,6 +3,9 @@
 # found in the LICENSE file.
 
 import("//build/config/linux/pkg_config.gni")
+if (use_efl) {
+  import("//tizen_src/build/config/tizen_features.gni")
+}
 
 declare_args() {
   # Controls whether the build should use the version of libffi library shipped
@@ -10,7 +13,8 @@ declare_args() {
   # on Linux, libffi must be statically linked to prevent a situation where the
   # runtime version of libffi is different from the build-time version from the
   # sysroot.
-  use_system_libffi = default_toolchain == "//build/toolchain/cros:target"
+  use_system_libffi =
+      default_toolchain == "//build/toolchain/cros:target" || build_chrome
 }
 
 if (use_system_libffi) {
index 77c1ea8..c0bde56 100755 (executable)
--- a/chrome.sh
+++ b/chrome.sh
@@ -1,3 +1,3 @@
 export EVAS_GL_NO_BLACKLIST=1
-export LD_LIBRARY_PATH=$PWD/out.x64/Dependencies/Root/lib64/:$LD_LIBRARY_PATH
-./out.x64/chrome $1 --no-sandbox --ignore-gpu-blocklist --use-gl=egl --ozone-platform=efl --window-size=800,600
\ No newline at end of file
+export LD_LIBRARY_PATH=$PWD/out.chrome.x64/Dependencies/Root/lib64/:$LD_LIBRARY_PATH
+./out.chrome.x64/chrome $1 --no-sandbox --ignore-gpu-blocklist --use-gl=egl --ozone-platform=efl --window-size=800,600
index fcab764..ea0b7d9 100644 (file)
@@ -392,7 +392,7 @@ if (!is_android && !is_mac) {
         ldflags += [ "--collect-inputs-only" ]
       }
 
-      if (is_linux) {
+      if (is_linux || is_tizen) {
         sources += [
           "app/chrome_main_linux.cc",
           "app/chrome_main_linux.h",
index cdae5fa..ac4785d 100644 (file)
@@ -2717,8 +2717,8 @@ static_library("browser") {
       "performance_monitor/metric_evaluator_helper_posix.h",
     ]
   }
-  if (enable_supervised_users &&
-      (is_android || is_win || is_linux || is_mac || is_chromeos_lacros)) {
+  if (enable_supervised_users && (is_android || is_win || is_linux || is_mac ||
+                                  is_chromeos_lacros || is_tizen)) {
     sources += [
       "metrics/family_link_user_metrics_provider.cc",
       "metrics/family_link_user_metrics_provider.h",
@@ -6399,7 +6399,7 @@ static_library("browser") {
     ]
   }
 
-  if (is_linux || is_win || is_mac || is_android) {
+  if (is_linux || is_win || is_mac || is_android || is_tizen) {
     sources += [
       "enterprise/idle/action.cc",
       "enterprise/idle/action.h",
@@ -6798,7 +6798,7 @@ static_library("browser") {
     ]
   }
 
-  if (is_linux) {
+  if (is_linux || is_tizen) {
     sources += [
       "metrics/pressure/pressure_metrics.cc",
       "metrics/pressure/pressure_metrics.h",
@@ -6860,7 +6860,7 @@ static_library("browser") {
     ]
   }
 
-  if (is_win || is_mac || is_linux || is_chromeos) {
+  if (is_win || is_mac || is_linux || is_chromeos || is_tizen) {
     deps += [
       "//components/power_metrics",
       "//components/user_notes:features",
@@ -7823,7 +7823,7 @@ static_library("browser") {
         "supervised_user/chromeos/supervised_user_web_content_handler_impl.h",
       ]
     }
-    if (is_win || is_linux || is_mac) {
+    if (is_win || is_linux || is_mac || is_tizen) {
       sources += [
         "supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.cc",
         "supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h",
index 9d8266f..2489b40 100644 (file)
@@ -1224,10 +1224,8 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
 #endif  // BUILDFLAG(ENABLE_PLUGINS)
 
 #if !BUILDFLAG(IS_ANDROID)
-#if defined(EWK_BRINGUP) && !BUILDFLAG(IS_TIZEN)  // FIXME: m108 bringup
   storage_monitor::StorageMonitor::Create();
 #endif
-#endif
 
   platform_part_->PreMainMessageLoopRun();
 
index e819129..fdc6f1e 100644 (file)
@@ -1333,7 +1333,8 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* profile,
       *UrlLanguageHistogramFactory::GetForBrowserContext(profile));
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || BUILDFLAG(IS_WIN) || \
+    BUILDFLAG(IS_MAC)  // FIXME : m120 bringup
   if (headless::IsHeadlessMode()) {
     headless::ReportHeadlessActionMetrics();
   }
index db77efe..0d3bc8c 100644 (file)
@@ -66,7 +66,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() {
   // initialization depend on FeatureList, and is done elsewhere.
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
-#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_TIZEN)
+#if !BUILDFLAG(IS_CHROMEOS)
   bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
 
   // Set up crypt config. This needs to be done before anything starts the
index a1d0f44..c0d196b 100644 (file)
@@ -94,6 +94,12 @@ class OneTimePermissionProvider
     ContentSettingsType type;
     ContentSettingsPattern primary_pattern;
     ContentSettingsPattern secondary_pattern;
+    ContentSettingEntry(ContentSettingsType type,
+                        ContentSettingsPattern primary_pattern,
+                        ContentSettingsPattern secondary_pattern)
+        : type(type),
+          primary_pattern(primary_pattern),
+          secondary_pattern(secondary_pattern) {}
   };
 
   void DeleteEntriesAndNotify(
index aecaaf7..b5ca34f 100644 (file)
@@ -50,6 +50,9 @@ struct SAMLProfileAttributes {
   std::string name;
   std::string domain;
   std::string token;
+  SAMLProfileAttributes() {}
+  SAMLProfileAttributes(std::string name, std::string domain, std::string token)
+      : name(name), domain(domain), token(token) {}
 };
 
 constexpr char kNameAttributeKey[] = "name";
index 93301e4..32d2ca8 100644 (file)
@@ -117,9 +117,14 @@ autofill::AutofillProfile CreateNewAutofillProfile(
   }
 
   AddressCountryCode address_country_code =
+#if !defined(EWK_BRINGUP)  // FIXME : m120 bringup
       country_code.has_value()
           ? AddressCountryCode(std::string(*country_code))
           : autofill::i18n_model_definition::kLegacyHierarchyCountryCode;
+#else
+      country_code.has_value() ? AddressCountryCode(std::string(*country_code))
+                               : AddressCountryCode(std::string("XX"));
+#endif
   return autofill::AutofillProfile(source, address_country_code);
 }
 
index 350c89b..86bdda3 100644 (file)
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 #include <span>  // std::size.
+#endif
 
 #include "base/containers/contains.h"
 #include "base/strings/stringprintf.h"
index a465ac6..c4c5bbc 100644 (file)
@@ -487,204 +487,203 @@ void RecordLinuxDistro() {
     }
   }
 
-  using enum UmaLinuxDistro;
   // This array must be kept sorted since it is binary searched.
   constexpr std::pair<const char*, UmaLinuxDistro> kDistroPrefixes[] = {
-      {"alma", kAlma},
-      {"alpine", kAlpine},
-      {"alter", kAlter},
-      {"amazon", kAmazon},
-      {"anarchy", kAnarchy},
-      {"antergos", kAntergos},
-      {"antix", kAntiX},
-      {"aoscos", kAoscOs},
-      {"aperio", kAperio},
-      {"apricity", kApricity},
-      {"arch", kArch},
-      {"arcolinux", kArcoLinux},
-      {"artix", kArtix},
-      {"arya", kArya},
-      {"asteroidos", kAsteroidOs},
-      {"ataraxia", kJanus},
-      {"bedrock", kBedrock},
-      {"bitrig", kBitrig},
-      {"blackarch", kBlackArch},
-      {"blag", kBlag},
-      {"blankon", kBlankOn},
-      {"bluelight", kBlueLight},
-      {"bodhi", kBodhi},
-      {"bonsai", kBonsai},
-      {"bunsenlabs", kBunsenLabs},
-      {"calculate", kCalculate},
-      {"carbs", kCarbs},
-      {"cblmariner", kCblMariner},
-      {"celos", kCelOs},
-      {"centos", kCentOs},
-      {"chakra", kChakra},
-      {"chaletos", kChaletOs},
-      {"chapeau", kChapeau},
-      {"cleanjaro", kCleanjaro},
-      {"clearlinux", kClearLinux},
-      {"clearos", kClearOs},
-      {"clover", kClover},
-      {"condres", kCondres},
-      {"containerlinux", kContainerLinux},
-      {"crux", kCrux},
-      {"crystallinux", kCrystalLinux},
-      {"cucumber", kCucumber},
-      {"cyberos", kCyberOs},
-      {"dahlia", kDahlia},
-      {"darkos", kDarkOs},
-      {"debian", kDebian},
-      {"deepin", kDeepin},
-      {"desaos", kDesaOs},
-      {"devuan", kDevuan},
-      {"dracos", kDracOs},
-      {"drauger", kDrauger},
-      {"elementary", kElementary},
-      {"endeavouros", kEndeavourOs},
-      {"endless", kEndless},
-      {"eurolinux", kEuroLinux},
-      {"exherbo", kExherbo},
-      {"fedora", kFedora},
-      {"feren", kFeren},
-      {"frugalware", kFrugalware},
-      {"funtoo", kFuntoo},
-      {"galliumos", kGalliumOs},
-      {"garuda", kGaruda},
-      {"gentoo", kGentoo},
-      {"glaucus", kGlaucus},
-      {"gnewsense", kGnewSense},
-      {"gnome", kGnome},
-      {"gobolinux", kGoboLinux},
-      {"grombyang", kGrombyang},
-      {"hash", kHash},
-      {"huayra", kHuayra},
-      {"hyperbola", kHyperbola},
-      {"i3buntu", kUbuntu},
-      {"iglu", kIglu},
-      {"instantos", kInstantOs},
-      {"itc", kItc},
-      {"janus", kJanus},
-      {"kaisen", kKaisen},
-      {"kali", kKali},
-      {"kaos", kKaOs},
-      {"kde", kKde},
-      {"kibojoe", kKibojoe},
-      {"kogaion", kKogaion},
-      {"korora", kKorora},
-      {"kslinux", kKsLinux},
-      {"kubuntu", kKubuntu},
-      {"langitketujuh", kLangitKetujuh},
-      {"laxeros", kLaxerOs},
-      {"lede", kLede},
-      {"libreelec", kLibreElec},
-      {"linuxlite", kLinuxLite},
-      {"linuxmint", kLinuxMint},
-      {"liveraizo", kLiveRaizo},
-      {"lmde", kLmde},
-      {"lubuntu", kLubuntu},
-      {"lunar", kLunar},
-      {"mageia", kMageia},
-      {"magpieos", kMagpieOs},
-      {"mandrake", kMandriva},
-      {"mandriva", kMandriva},
-      {"manjaro", kManjaro},
-      {"maui", kMaui},
-      {"mer", kMer},
-      {"minix", kMinix},
-      {"mint", kLinuxMint},
-      {"mx", kMx},
-      {"namib", kNamib},
-      {"neptune", kNeptune},
-      {"netrunner", kNetrunner},
-      {"nitrux", kNitrux},
-      {"nixos", kNixOs},
-      {"nurunner", kNurunner},
-      {"nutyx", kNutyX},
-      {"obarun", kObarun},
-      {"obrevenge", kObRevenge},
-      {"openeuler", kOpenEuler},
-      {"openindiana", kOpenIndiana},
-      {"openmamba", kOpenMamba},
-      {"openmandriva", kOpenMandriva},
-      {"opensourcemediacenter", kOpenSourceMediaCenter},
-      {"openstage", kOpenStage},
-      {"opensuse", kOpenSuse},
-      {"opensuseleap", kOpenSuseLeap},
-      {"opensusetumbleweed", kOpenSuseTumbleweed},
-      {"openwrt", kOpenWrt},
-      {"oracle", kOracle},
-      {"oselbrus", kOsElbrus},
-      {"osmc", kOpenSourceMediaCenter},
-      {"parabola", kParabola},
-      {"pardus", kPardus},
-      {"parrot", kParrot},
-      {"parsix", kParsix},
-      {"pclinuxos", kPcLinuxOs},
-      {"pengwin", kPengwin},
-      {"pentoo", kPentoo},
-      {"peppermint", kPeppermint},
-      {"pisi", kPisi},
-      {"pnmlinux", kPnmLinux},
-      {"popos", kPopOs},
-      {"porteus", kPorteus},
-      {"postmarketos", kPostMarketOs},
-      {"precisepuppy", kPuppy},
-      {"proxmox", kProxmox},
-      {"puffos", kPuffOs},
-      {"puppy", kPuppy},
-      {"pureos", kPureOs},
-      {"qubes", kQubes},
-      {"qubyt", kQubyt},
-      {"quibian", kQuibian},
-      {"quirkywerewolf", kPuppy},
-      {"radix", kRadix},
-      {"raspbian", kRaspbian},
-      {"reborn", kReborn},
-      {"redcore", kRedcore},
-      {"redhat", kRedhat},
-      {"redstar", kRedStar},
-      {"refracteddevuan", kRefractedDevuan},
-      {"regata", kRegata},
-      {"regolith", kRegolith},
-      {"rhel", kRedhat},
-      {"rocky", kRocky},
-      {"rosa", kRosa},
-      {"sabayon", kSabayon},
-      {"sabotage", kSabotage},
-      {"sailfish", kSailfish},
-      {"salentos", kSalentOs},
-      {"scientific", kScientific},
-      {"semc", kSemc},
-      {"septor", kSeptor},
-      {"serene", kSerene},
-      {"sharklinux", kSharkLinux},
-      {"siduction", kSiduction},
-      {"skiffos", kSkiffOs},
-      {"slackware", kSlackware},
-      {"slitaz", kSliTaz},
-      {"smartos", kSmartOs},
-      {"solus", kSolus},
-      {"sourcemage", kSourceMage},
-      {"sparky", kSparky},
-      {"star", kStar},
-      {"steamos", kSteamOs},
-      {"suse", kOpenSuse},
-      {"swagarch", kSwagArch},
-      {"t2", kT2},
-      {"tails", kTails},
-      {"tearch", kTeArch},
-      {"trisquel", kTrisquel},
-      {"ubuntu", kUbuntu},
-      {"univention", kUnivention},
-      {"venom", kVenom},
-      {"vnux", kVnux},
-      {"void", kVoid},
-      {"whpnmlinux", kPnmLinux},
-      {"xferience", kXferience},
-      {"xubuntu", kXubuntu},
-      {"zorin", kZorin},
+      {"alma", UmaLinuxDistro::kAlma},
+      {"alpine", UmaLinuxDistro::kAlpine},
+      {"alter", UmaLinuxDistro::kAlter},
+      {"amazon", UmaLinuxDistro::kAmazon},
+      {"anarchy", UmaLinuxDistro::kAnarchy},
+      {"antergos", UmaLinuxDistro::kAntergos},
+      {"antix", UmaLinuxDistro::kAntiX},
+      {"aoscos", UmaLinuxDistro::kAoscOs},
+      {"aperio", UmaLinuxDistro::kAperio},
+      {"apricity", UmaLinuxDistro::kApricity},
+      {"arch", UmaLinuxDistro::kArch},
+      {"arcolinux", UmaLinuxDistro::kArcoLinux},
+      {"artix", UmaLinuxDistro::kArtix},
+      {"arya", UmaLinuxDistro::kArya},
+      {"asteroidos", UmaLinuxDistro::kAsteroidOs},
+      {"ataraxia", UmaLinuxDistro::kJanus},
+      {"bedrock", UmaLinuxDistro::kBedrock},
+      {"bitrig", UmaLinuxDistro::kBitrig},
+      {"blackarch", UmaLinuxDistro::kBlackArch},
+      {"blag", UmaLinuxDistro::kBlag},
+      {"blankon", UmaLinuxDistro::kBlankOn},
+      {"bluelight", UmaLinuxDistro::kBlueLight},
+      {"bodhi", UmaLinuxDistro::kBodhi},
+      {"bonsai", UmaLinuxDistro::kBonsai},
+      {"bunsenlabs", UmaLinuxDistro::kBunsenLabs},
+      {"calculate", UmaLinuxDistro::kCalculate},
+      {"carbs", UmaLinuxDistro::kCarbs},
+      {"cblmariner", UmaLinuxDistro::kCblMariner},
+      {"celos", UmaLinuxDistro::kCelOs},
+      {"centos", UmaLinuxDistro::kCentOs},
+      {"chakra", UmaLinuxDistro::kChakra},
+      {"chaletos", UmaLinuxDistro::kChaletOs},
+      {"chapeau", UmaLinuxDistro::kChapeau},
+      {"cleanjaro", UmaLinuxDistro::kCleanjaro},
+      {"clearlinux", UmaLinuxDistro::kClearLinux},
+      {"clearos", UmaLinuxDistro::kClearOs},
+      {"clover", UmaLinuxDistro::kClover},
+      {"condres", UmaLinuxDistro::kCondres},
+      {"containerlinux", UmaLinuxDistro::kContainerLinux},
+      {"crux", UmaLinuxDistro::kCrux},
+      {"crystallinux", UmaLinuxDistro::kCrystalLinux},
+      {"cucumber", UmaLinuxDistro::kCucumber},
+      {"cyberos", UmaLinuxDistro::kCyberOs},
+      {"dahlia", UmaLinuxDistro::kDahlia},
+      {"darkos", UmaLinuxDistro::kDarkOs},
+      {"debian", UmaLinuxDistro::kDebian},
+      {"deepin", UmaLinuxDistro::kDeepin},
+      {"desaos", UmaLinuxDistro::kDesaOs},
+      {"devuan", UmaLinuxDistro::kDevuan},
+      {"dracos", UmaLinuxDistro::kDracOs},
+      {"drauger", UmaLinuxDistro::kDrauger},
+      {"elementary", UmaLinuxDistro::kElementary},
+      {"endeavouros", UmaLinuxDistro::kEndeavourOs},
+      {"endless", UmaLinuxDistro::kEndless},
+      {"eurolinux", UmaLinuxDistro::kEuroLinux},
+      {"exherbo", UmaLinuxDistro::kExherbo},
+      {"fedora", UmaLinuxDistro::kFedora},
+      {"feren", UmaLinuxDistro::kFeren},
+      {"frugalware", UmaLinuxDistro::kFrugalware},
+      {"funtoo", UmaLinuxDistro::kFuntoo},
+      {"galliumos", UmaLinuxDistro::kGalliumOs},
+      {"garuda", UmaLinuxDistro::kGaruda},
+      {"gentoo", UmaLinuxDistro::kGentoo},
+      {"glaucus", UmaLinuxDistro::kGlaucus},
+      {"gnewsense", UmaLinuxDistro::kGnewSense},
+      {"gnome", UmaLinuxDistro::kGnome},
+      {"gobolinux", UmaLinuxDistro::kGoboLinux},
+      {"grombyang", UmaLinuxDistro::kGrombyang},
+      {"hash", UmaLinuxDistro::kHash},
+      {"huayra", UmaLinuxDistro::kHuayra},
+      {"hyperbola", UmaLinuxDistro::kHyperbola},
+      {"i3buntu", UmaLinuxDistro::kUbuntu},
+      {"iglu", UmaLinuxDistro::kIglu},
+      {"instantos", UmaLinuxDistro::kInstantOs},
+      {"itc", UmaLinuxDistro::kItc},
+      {"janus", UmaLinuxDistro::kJanus},
+      {"kaisen", UmaLinuxDistro::kKaisen},
+      {"kali", UmaLinuxDistro::kKali},
+      {"kaos", UmaLinuxDistro::kKaOs},
+      {"kde", UmaLinuxDistro::kKde},
+      {"kibojoe", UmaLinuxDistro::kKibojoe},
+      {"kogaion", UmaLinuxDistro::kKogaion},
+      {"korora", UmaLinuxDistro::kKorora},
+      {"kslinux", UmaLinuxDistro::kKsLinux},
+      {"kubuntu", UmaLinuxDistro::kKubuntu},
+      {"langitketujuh", UmaLinuxDistro::kLangitKetujuh},
+      {"laxeros", UmaLinuxDistro::kLaxerOs},
+      {"lede", UmaLinuxDistro::kLede},
+      {"libreelec", UmaLinuxDistro::kLibreElec},
+      {"linuxlite", UmaLinuxDistro::kLinuxLite},
+      {"linuxmint", UmaLinuxDistro::kLinuxMint},
+      {"liveraizo", UmaLinuxDistro::kLiveRaizo},
+      {"lmde", UmaLinuxDistro::kLmde},
+      {"lubuntu", UmaLinuxDistro::kLubuntu},
+      {"lunar", UmaLinuxDistro::kLunar},
+      {"mageia", UmaLinuxDistro::kMageia},
+      {"magpieos", UmaLinuxDistro::kMagpieOs},
+      {"mandrake", UmaLinuxDistro::kMandriva},
+      {"mandriva", UmaLinuxDistro::kMandriva},
+      {"manjaro", UmaLinuxDistro::kManjaro},
+      {"maui", UmaLinuxDistro::kMaui},
+      {"mer", UmaLinuxDistro::kMer},
+      {"minix", UmaLinuxDistro::kMinix},
+      {"mint", UmaLinuxDistro::kLinuxMint},
+      {"mx", UmaLinuxDistro::kMx},
+      {"namib", UmaLinuxDistro::kNamib},
+      {"neptune", UmaLinuxDistro::kNeptune},
+      {"netrunner", UmaLinuxDistro::kNetrunner},
+      {"nitrux", UmaLinuxDistro::kNitrux},
+      {"nixos", UmaLinuxDistro::kNixOs},
+      {"nurunner", UmaLinuxDistro::kNurunner},
+      {"nutyx", UmaLinuxDistro::kNutyX},
+      {"obarun", UmaLinuxDistro::kObarun},
+      {"obrevenge", UmaLinuxDistro::kObRevenge},
+      {"openeuler", UmaLinuxDistro::kOpenEuler},
+      {"openindiana", UmaLinuxDistro::kOpenIndiana},
+      {"openmamba", UmaLinuxDistro::kOpenMamba},
+      {"openmandriva", UmaLinuxDistro::kOpenMandriva},
+      {"opensourcemediacenter", UmaLinuxDistro::kOpenSourceMediaCenter},
+      {"openstage", UmaLinuxDistro::kOpenStage},
+      {"opensuse", UmaLinuxDistro::kOpenSuse},
+      {"opensuseleap", UmaLinuxDistro::kOpenSuseLeap},
+      {"opensusetumbleweed", UmaLinuxDistro::kOpenSuseTumbleweed},
+      {"openwrt", UmaLinuxDistro::kOpenWrt},
+      {"oracle", UmaLinuxDistro::kOracle},
+      {"oselbrus", UmaLinuxDistro::kOsElbrus},
+      {"osmc", UmaLinuxDistro::kOpenSourceMediaCenter},
+      {"parabola", UmaLinuxDistro::kParabola},
+      {"pardus", UmaLinuxDistro::kPardus},
+      {"parrot", UmaLinuxDistro::kParrot},
+      {"parsix", UmaLinuxDistro::kParsix},
+      {"pclinuxos", UmaLinuxDistro::kPcLinuxOs},
+      {"pengwin", UmaLinuxDistro::kPengwin},
+      {"pentoo", UmaLinuxDistro::kPentoo},
+      {"peppermint", UmaLinuxDistro::kPeppermint},
+      {"pisi", UmaLinuxDistro::kPisi},
+      {"pnmlinux", UmaLinuxDistro::kPnmLinux},
+      {"popos", UmaLinuxDistro::kPopOs},
+      {"porteus", UmaLinuxDistro::kPorteus},
+      {"postmarketos", UmaLinuxDistro::kPostMarketOs},
+      {"precisepuppy", UmaLinuxDistro::kPuppy},
+      {"proxmox", UmaLinuxDistro::kProxmox},
+      {"puffos", UmaLinuxDistro::kPuffOs},
+      {"puppy", UmaLinuxDistro::kPuppy},
+      {"pureos", UmaLinuxDistro::kPureOs},
+      {"qubes", UmaLinuxDistro::kQubes},
+      {"qubyt", UmaLinuxDistro::kQubyt},
+      {"quibian", UmaLinuxDistro::kQuibian},
+      {"quirkywerewolf", UmaLinuxDistro::kPuppy},
+      {"radix", UmaLinuxDistro::kRadix},
+      {"raspbian", UmaLinuxDistro::kRaspbian},
+      {"reborn", UmaLinuxDistro::kReborn},
+      {"redcore", UmaLinuxDistro::kRedcore},
+      {"redhat", UmaLinuxDistro::kRedhat},
+      {"redstar", UmaLinuxDistro::kRedStar},
+      {"refracteddevuan", UmaLinuxDistro::kRefractedDevuan},
+      {"regata", UmaLinuxDistro::kRegata},
+      {"regolith", UmaLinuxDistro::kRegolith},
+      {"rhel", UmaLinuxDistro::kRedhat},
+      {"rocky", UmaLinuxDistro::kRocky},
+      {"rosa", UmaLinuxDistro::kRosa},
+      {"sabayon", UmaLinuxDistro::kSabayon},
+      {"sabotage", UmaLinuxDistro::kSabotage},
+      {"sailfish", UmaLinuxDistro::kSailfish},
+      {"salentos", UmaLinuxDistro::kSalentOs},
+      {"scientific", UmaLinuxDistro::kScientific},
+      {"semc", UmaLinuxDistro::kSemc},
+      {"septor", UmaLinuxDistro::kSeptor},
+      {"serene", UmaLinuxDistro::kSerene},
+      {"sharklinux", UmaLinuxDistro::kSharkLinux},
+      {"siduction", UmaLinuxDistro::kSiduction},
+      {"skiffos", UmaLinuxDistro::kSkiffOs},
+      {"slackware", UmaLinuxDistro::kSlackware},
+      {"slitaz", UmaLinuxDistro::kSliTaz},
+      {"smartos", UmaLinuxDistro::kSmartOs},
+      {"solus", UmaLinuxDistro::kSolus},
+      {"sourcemage", UmaLinuxDistro::kSourceMage},
+      {"sparky", UmaLinuxDistro::kSparky},
+      {"star", UmaLinuxDistro::kStar},
+      {"steamos", UmaLinuxDistro::kSteamOs},
+      {"suse", UmaLinuxDistro::kOpenSuse},
+      {"swagarch", UmaLinuxDistro::kSwagArch},
+      {"t2", UmaLinuxDistro::kT2},
+      {"tails", UmaLinuxDistro::kTails},
+      {"tearch", UmaLinuxDistro::kTeArch},
+      {"trisquel", UmaLinuxDistro::kTrisquel},
+      {"ubuntu", UmaLinuxDistro::kUbuntu},
+      {"univention", UmaLinuxDistro::kUnivention},
+      {"venom", UmaLinuxDistro::kVenom},
+      {"vnux", UmaLinuxDistro::kVnux},
+      {"void", UmaLinuxDistro::kVoid},
+      {"whpnmlinux", UmaLinuxDistro::kPnmLinux},
+      {"xferience", UmaLinuxDistro::kXferience},
+      {"xubuntu", UmaLinuxDistro::kXubuntu},
+      {"zorin", UmaLinuxDistro::kZorin},
   };
   struct Compare {
     bool operator()(const std::string& string,
index 5a28cf8..c49fe21 100644 (file)
@@ -472,7 +472,7 @@ void SystemNetworkContextManager::DeleteInstance() {
   g_system_network_context_manager = nullptr;
 }
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
 SystemNetworkContextManager::GssapiLibraryLoadObserver::
     GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
     : owner_(owner) {}
@@ -727,7 +727,7 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
   OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
   network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
   gssapi_library_loader_observer_.Install(network_service);
 #endif  // BUILDFLAG(IS_LINUX)
 
index 539396a..2bfd0e5 100644 (file)
@@ -4592,7 +4592,7 @@ static_library("ui") {
   # Device signals sharing currently only supports win, mac, linux and
   # ash-chromeos, so the corresponding consent functionality are
   # limited to the same set of platforms.
-  if (is_win || is_mac || is_linux || is_chromeos_ash) {
+  if (is_win || is_mac || is_linux || is_chromeos_ash || is_tizen) {
     sources += [
       "device_signals_consent/consent_requester.h",
       "views/device_signals_consent/consent_dialog_coordinator.cc",
index 964f7a2..915efe8 100644 (file)
@@ -38,6 +38,19 @@ class LocationBar {
     base::TimeTicks match_selection_timestamp;
     bool url_typed_without_scheme;
     bool url_typed_with_http_scheme;
+    NavigationParams() {}
+    NavigationParams(GURL destination_url,
+                     WindowOpenDisposition disposition,
+                     ui::PageTransition transition,
+                     base::TimeTicks match_selection_timestamp,
+                     bool url_typed_without_scheme,
+                     bool url_typed_with_http_scheme)
+        : destination_url(destination_url),
+          disposition(disposition),
+          transition(transition),
+          match_selection_timestamp(match_selection_timestamp),
+          url_typed_without_scheme(url_typed_without_scheme),
+          url_typed_with_http_scheme(url_typed_with_http_scheme) {}
   };
 
   explicit LocationBar(CommandUpdater* command_updater)
index 7cfb747..84899ec 100644 (file)
@@ -1995,7 +1995,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
                  OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled()
              ? omnibox::kShareWinChromeRefreshIcon
              : omnibox::kShareWinIcon;
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
   return OmniboxFieldTrial::IsChromeRefreshIconsEnabled() ||
                  OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled()
              ? omnibox::kShareLinuxChromeRefreshIcon
index 8d26537..6e9090e 100644 (file)
@@ -21,6 +21,8 @@
 struct MenuNotificationEntry {
   int command = 0;
   std::u16string label;
+  MenuNotificationEntry(int command, std::u16string label)
+      : command(command), label(label) {}
 };
 
 namespace {
index d8af8fe..7180f07 100644 (file)
 // TODO(dfried, tbergquist): move this file down to c/b/ui if it's used outside
 // of the tabstrip.
 
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 #include <concepts>
+#endif
 #include <cstdint>
 #include <map>
+#include <type_traits>
 
 #include "base/check.h"
 #include "base/no_destructor.h"
 // It is required that `T` derive from this class. This constraint is enforced
 // via a helper class, as it cannot be enforced before SupportsHandles is
 // defined.
-template <typename T, std::integral V = int32_t>
+template <typename T, typename V = int32_t>
 class SupportsHandles {
+  static_assert(std::is_integral_v<V>);
+
  public:
   SupportsHandles();
   virtual ~SupportsHandles();
@@ -100,8 +105,10 @@ class SupportsHandles {
 //
 // Unlike WeakPtr there is some overhead in looking up a handle, so convenience
 // operators (bool, !, ->, *) are not provided.
-template <typename T, std::integral V>
+template <typename T, typename V>
 class SupportsHandles<T, V>::Handle {
+  static_assert(std::is_integral_v<V>);
+
  public:
   Handle() = default;
   Handle(const Handle& other) = default;
@@ -149,9 +156,11 @@ namespace internal {
 //
 // This object is strictly sequence-checked and should only ever be accessed
 // from the primary UI thread.
-template <typename T, std::integral V>
-  requires std::derived_from<T, SupportsHandles<T, V>>
+template <typename T, typename V>
 class HandleHelper {
+  static_assert(std::is_integral_v<V>);
+  static_assert(std::is_base_of_v<SupportsHandles<T, V>, T>);
+
  public:
   using StoredPointerType = SupportsHandles<T, V>*;
 
@@ -206,25 +215,29 @@ class HandleHelper {
 
 }  // namespace internal
 
-template <typename T, std::integral V>
+template <typename T, typename V>
 SupportsHandles<T, V>::SupportsHandles()
     : handle_value_(
           internal::HandleHelper<T, V>::GetInstance().AssignHandleValue(this)) {
+  static_assert(std::is_integral_v<V>);
 }
 
-template <typename T, std::integral V>
+template <typename T, typename V>
 SupportsHandles<T, V>::~SupportsHandles() {
+  static_assert(std::is_integral_v<V>);
   internal::HandleHelper<T, V>::GetInstance().FreeHandleValue(handle_value_);
 }
 
-template <typename T, std::integral V>
+template <typename T, typename V>
 typename SupportsHandles<T, V>::Handle SupportsHandles<T, V>::GetHandle()
     const {
+  static_assert(std::is_integral_v<V>);
   return Handle(handle_value_);
 }
 
-template <typename T, std::integral V>
+template <typename T, typename V>
 T* SupportsHandles<T, V>::Handle::Get() const {
+  static_assert(std::is_integral_v<V>);
   return internal::HandleHelper<T, V>::GetInstance().LookupObject(raw_value_);
 }
 
index e9c6c35..82428fc 100644 (file)
@@ -86,12 +86,19 @@ class EmbeddedPermissionPromptBaseView : public PermissionPromptBaseView {
   struct RequestLineConfiguration {
     const raw_ptr<const gfx::VectorIcon> icon;
     std::u16string message;
+    RequestLineConfiguration(const raw_ptr<const gfx::VectorIcon> icon,
+                             std::u16string message)
+        : icon(icon), message(message) {}
   };
 
   struct ButtonConfiguration {
     std::u16string label;
     ButtonType type;
     ui::ButtonStyle style;
+    ButtonConfiguration(std::u16string label,
+                        ButtonType type,
+                        ui::ButtonStyle style)
+        : label(label), type(type), style(style) {}
   };
 
   static int GetViewId(ButtonType button) { return static_cast<int>(button); }
index 3e917d0..f7ddb0b 100644 (file)
@@ -490,7 +490,9 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() const {
   if (!IsHoverAnimationActive()) {
     return base_opacity;
   }
-  return std::lerp(base_opacity, GetHoverOpacity(), GetHoverAnimationValue());
+  return std::lerp(static_cast<double>(base_opacity),
+                   static_cast<double>(GetHoverOpacity()),
+                   GetHoverAnimationValue());
 }
 
 TabActive GM2TabStyleViews::GetApparentActiveState() const {
index 338992f..0cb75e6 100644 (file)
@@ -37,7 +37,11 @@ void WebAppIconDiagnostic::Run(
   if (!downloaded_icon_sizes.empty())
     icon_size_ = *downloaded_icon_sizes.begin();
 
+#if !defined(EWK_BRINGUP)  // FIXME : m120 bringup
   result_.emplace();
+#else
+  result_ = Result();
+#endif
   result_->has_empty_downloaded_icon_sizes = downloaded_icon_sizes.empty();
   result_->has_generated_icon_flag = app_->is_generated_icon();
 
index c92a35e..e5b4ce0 100644 (file)
@@ -146,7 +146,7 @@ constexpr char kMacShareIconResourceName[] =
 #elif BUILDFLAG(IS_WIN)
 constexpr char kWinShareIconResourceName[] =
     "//resources/cr_components/omnibox/icons/win_share.svg";
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
 constexpr char kLinuxShareIconResourceName[] =
     "//resources/cr_components/omnibox/icons/share.svg";
 #else
@@ -745,7 +745,7 @@ std::string RealboxHandler::PedalVectorIconToResourceName(
       icon.name == omnibox::kShareWinChromeRefreshIcon.name) {
     return kWinShareIconResourceName;
   }
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
   if (icon.name == omnibox::kShareIcon.name ||
       icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) {
     return kLinuxShareIconResourceName;
index ad19f25..7871550 100644 (file)
@@ -9,8 +9,10 @@
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
+#if !defined(BUILD_CHROME)
 #include "chrome/grit/sandbox_internals_resources.h"
 #include "chrome/grit/sandbox_internals_resources_map.h"
+#endif
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
@@ -70,9 +72,11 @@ static void SetSandboxStatusData(content::WebUIDataSource* source) {
 void CreateAndAddDataSource(Profile* profile) {
   content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd(
       profile, chrome::kChromeUISandboxHost);
+#if !defined(BUILD_CHROME)
   source->AddResourcePaths(base::make_span(kSandboxInternalsResources,
                                            kSandboxInternalsResourcesSize));
   source->SetDefaultResource(IDR_SANDBOX_INTERNALS_SANDBOX_INTERNALS_HTML);
+#endif
 
   source->OverrideContentSecurityPolicy(
       network::mojom::CSPDirectiveName::ScriptSrc,
index 36b7663..1028cb0 100644 (file)
@@ -122,7 +122,4 @@ UpdateManifest::VersionEntry GetLatestVersionEntry(
       });
 }
 
-bool operator==(const UpdateManifest::VersionEntry& lhs,
-                const UpdateManifest::VersionEntry& rhs) = default;
-
 }  // namespace web_app
index 1de9b47..674532f 100644 (file)
@@ -56,7 +56,8 @@ class UpdateManifest {
     base::Version version() const;
 
    private:
-    friend bool operator==(const VersionEntry& a, const VersionEntry& b);
+    friend bool operator==(const VersionEntry& a,
+                           const VersionEntry& b) = default;
 
     GURL src_;
     base::Version version_;
@@ -75,9 +76,6 @@ class UpdateManifest {
 UpdateManifest::VersionEntry GetLatestVersionEntry(
     const UpdateManifest& update_manifest);
 
-bool operator==(const UpdateManifest::VersionEntry& lhs,
-                const UpdateManifest::VersionEntry& rhs);
-
 }  // namespace web_app
 
 #endif  // CHROME_BROWSER_WEB_APPLICATIONS_ISOLATED_WEB_APPS_UPDATE_MANIFEST_UPDATE_MANIFEST_H_
index a3984c6..b058513 100644 (file)
@@ -914,11 +914,6 @@ const absl::optional<GeneratedIconFix>& WebApp::generated_icon_fix() const {
   return generated_icon_fix_;
 }
 
-bool WebApp::IsolationData::PendingUpdateInfo::operator==(
-    const WebApp::IsolationData::PendingUpdateInfo& other) const = default;
-bool WebApp::IsolationData::PendingUpdateInfo::operator!=(
-    const WebApp::IsolationData::PendingUpdateInfo& other) const = default;
-
 bool WebApp::operator==(const WebApp& other) const {
   auto AsTuple = [](const WebApp& app) {
     // Keep in order declared in web_app.h.
index ac8abc7..b81c494 100644 (file)
@@ -350,8 +350,8 @@ class WebApp {
       PendingUpdateInfo(const PendingUpdateInfo&);
       PendingUpdateInfo& operator=(const PendingUpdateInfo&);
 
-      bool operator==(const PendingUpdateInfo&) const;
-      bool operator!=(const PendingUpdateInfo&) const;
+      bool operator==(const PendingUpdateInfo&) const = default;
+      bool operator!=(const PendingUpdateInfo&) const = default;
 
       base::Value AsDebugValue() const;
       friend std::ostream& operator<<(std::ostream& os,
index 268597c..f8077e1 100644 (file)
@@ -367,8 +367,6 @@ AuthenticatorRequestDialogModel::Mechanism::CredentialInfo::CredentialInfo(
     const CredentialInfo&) = default;
 AuthenticatorRequestDialogModel::Mechanism::CredentialInfo::~CredentialInfo() =
     default;
-bool AuthenticatorRequestDialogModel::Mechanism::CredentialInfo::operator==(
-    const CredentialInfo&) const = default;
 
 void AuthenticatorRequestDialogModel::ResetEphemeralState() {
   ephemeral_state_ = {};
index 82011e0..88035a0 100644 (file)
@@ -206,7 +206,7 @@ class AuthenticatorRequestDialogModel
                      std::vector<uint8_t> user_id_in);
       CredentialInfo(const CredentialInfo&);
       ~CredentialInfo();
-      bool operator==(const CredentialInfo&) const;
+      bool operator==(const CredentialInfo&) const = default;
 
       const device::AuthenticatorType source;
       const std::vector<uint8_t> user_id;
index b8d3ac5..723b3ef 100644 (file)
@@ -2372,10 +2372,14 @@ bool PasswordAutofillAgent::SupportAutoLogin() {
   //  org.tizen.browser,  com.samsung.tv.knox-browser
   // Only org.tizen.browser app need AutoLogin behavior according to their spec.
   // The latter just wants Autofill.
+#if defined(BUILD_CHROME)
+  return false;
+#else
   const std::string tizen_app_id =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kTizenAppId);
   return tizen_app_id == "org.tizen.browser";
+#endif
 }
 #endif
 
index 8f4df85..a68c020 100644 (file)
@@ -1073,8 +1073,6 @@ MediaType::MediaType(const std::string& vendor_id,
                      const std::string& custom_display_name)
     : vendor_id(vendor_id), custom_display_name(custom_display_name) {}
 
-bool MediaType::operator==(const MediaType& other) const = default;
-
 bool MediaType::IsValid() const {
   return !vendor_id.empty();
 }
index 173a121..944a4c4 100644 (file)
@@ -574,7 +574,7 @@ struct MediaType {
   MediaType(const std::string& vendor_id,
             const std::string& custom_display_name);
 
-  bool operator==(const MediaType& other) const;
+  bool operator==(const MediaType& other) const = default;
   bool operator!=(const MediaType& other) const { return !(*this == other); }
 
   bool IsValid() const;
index 3c79b27..971c209 100644 (file)
@@ -31,7 +31,8 @@ __attribute__((visibility("default"), used)) int CrashpadHandlerMain(
     char* argv[]) {
   crashpad::UserStreamDataSources user_stream_data_sources;
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
+    !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
   user_stream_data_sources.push_back(
       std::make_unique<stability_report::UserStreamDataSourcePosix>());
 #endif
index 1cf092d..4943089 100644 (file)
@@ -162,7 +162,6 @@ CreditCardIssuer GetCardNetwork(const std::string& number) {
 }
 
 bool HasCorrectLength(const std::string& number) {
-  using enum CreditCardIssuer;
   // Credit card numbers are at most 19 digits in length, 12 digits seems to
   // be a fairly safe lower-bound [1].  Specific card issuers have more rigidly
   // defined sizes.
@@ -177,27 +176,32 @@ bool HasCorrectLength(const std::string& number) {
   }
 
   const CreditCardIssuer type = GetCardNetwork(number);
-  if (type == kGenericCard) {
+  if (type == CreditCardIssuer::kGenericCard) {
     return true;
   }
 
   switch (number.size()) {
     case 13:
-      return type == kVisaCard;
+      return type == CreditCardIssuer::kVisaCard;
     case 14:
-      return type == kDinersCard;
+      return type == CreditCardIssuer::kDinersCard;
     case 15:
-      return type == kAmericanExpressCard;
+      return type == CreditCardIssuer::kAmericanExpressCard;
     case 16:
-      return (type == kDiscoverCard || type == kJCBCard ||
-              type == kMasterCard || type == kMirCard || type == kTroyCard ||
-              type == kUnionPay || type == kVisaCard);
+      return (type == CreditCardIssuer::kDiscoverCard ||
+              type == CreditCardIssuer::kJCBCard ||
+              type == CreditCardIssuer::kMasterCard ||
+              type == CreditCardIssuer::kMirCard ||
+              type == CreditCardIssuer::kTroyCard ||
+              type == CreditCardIssuer::kUnionPay ||
+              type == CreditCardIssuer::kVisaCard);
     case 17:
       [[fallthrough]];
     case 18:
-      return type == kUnionPay;
+      return type == CreditCardIssuer::kUnionPay;
     case 19:
-      return (type == kUnionPay || type == kVisaCard);
+      return (type == CreditCardIssuer::kUnionPay ||
+              type == CreditCardIssuer::kVisaCard);
     default: {
       return false;
     }
index 0424725..e187882 100644 (file)
@@ -8,6 +8,10 @@
 
 #include "base/auto_reset.h"
 #include "base/feature_list.h"
+#if BUILDFLAG(IS_TIZEN)
+#include "base/strings/utf_string_conversions.h"
+#include "base/trace_event/trace_event.h"
+#endif
 #include "build/build_config.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
 #include "components/omnibox/browser/autocomplete_input.h"
index bbb5208..153c672 100644 (file)
@@ -240,7 +240,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
   void SendForBatchExecution(
       BatchExecutionCallback callback_on_complete,
       base::TimeTicks start_time,
-      ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
       override {
     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -262,7 +262,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
   // Starts the synchronous execution of the model. Returns model outputs.
   // Model needs to be loaded. Synchronous calls do not load or unload model.
   std::vector<absl::optional<OutputType>> SendForBatchExecutionSync(
-      ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
       override {
     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -417,7 +417,8 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
   // executes it on the model execution thread.
   void LoadModelFileAndBatchExecute(
       BatchExecutionCallback callback_on_complete,
-      ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector
+          inputs) {
     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
@@ -434,7 +435,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
 
   // Batch executes the loaded model for inputs.
   void BatchExecuteLoadedModel(
-      ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
       std::vector<absl::optional<OutputType>>* outputs) {
     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -494,7 +495,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
   // Unloads the model if needed.
   void BatchExecuteLoadedModelAndRunCallback(
       BatchExecutionCallback callback_on_complete,
-      ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
       ExecutionStatus execution_status) {
     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
index d1b9b5e..55f9817 100644 (file)
@@ -12,7 +12,7 @@ declare_args() {
   # TODO(b/269198471): Make sure the internal archive files for opt guide get
   #   updated when win arm64 gets added as a supported platform for TFLite.
   build_with_tflite_lib = is_android || is_win || is_linux || is_mac ||
-                          is_chromeos || is_fuchsia || is_ios
+                          is_chromeos || is_fuchsia || is_ios || is_tizen
 }
 
 declare_args() {
index c4bca6f..d1c16fe 100644 (file)
@@ -37,7 +37,8 @@ component("os_crypt") {
   }
 
   # TODO(crbug.com/1339022): Provide a Fuchsia-specific implementation.
-  if ((is_posix && !is_apple && !(is_linux && !is_castos)) || is_fuchsia) {
+  if ((is_posix && !is_tizen && !is_apple && !(is_linux && !is_castos)) ||
+      is_fuchsia) {
     sources += [ "os_crypt_posix.cc" ]
   }
 
@@ -55,7 +56,7 @@ component("os_crypt") {
     libs = [ "crypt32.lib" ]
   }
 
-  if (is_linux && !is_castos) {
+  if ((is_linux || is_tizen) && !is_castos) {
     sources += [
       "key_storage_config_linux.cc",
       "key_storage_config_linux.h",
index 8295399..c6c863a 100644 (file)
@@ -298,7 +298,7 @@ source_set("internal") {
     ]
   }
 
-  if (is_win || is_mac || is_linux) {
+  if (is_win || is_mac || is_linux || is_tizen) {
     sources += [
       "cloud/profile_cloud_policy_manager.cc",
       "cloud/profile_cloud_policy_manager.h",
index 1145054..da50d5f 100644 (file)
@@ -1529,6 +1529,9 @@ bool CompareKeys(const PropertyNode& node, const std::string& key) {
 }  // namespace
 
 Schema Schema::GetKnownProperty(const std::string& key) const {
+#if defined(BUILD_CHROME)  // FIXME: Hotfix
+  return Schema();
+#endif
   CHECK(valid());
   CHECK_EQ(base::Value::Type::DICT, type());
   const PropertiesNode* node = storage_->properties(node_->extra);
index 3809325..23f0996 100644 (file)
@@ -41,14 +41,14 @@ static_library("power_metrics") {
     ldflags = [ "/DELAYLOAD:setupapi.dll" ]
   }
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [
       "energy_metrics_provider_linux.cc",
       "energy_metrics_provider_linux.h",
     ]
   }
 
-  if (is_win || is_linux || is_chromeos) {
+  if (is_win || is_linux || is_chromeos || is_tizen) {
     sources += [
       "system_power_monitor.cc",
       "system_power_monitor.h",
index 587d4d2..cb77065 100644 (file)
@@ -6,6 +6,7 @@
 
 namespace stability_report {
 
+#if !defined(BUILD_CHROME)
 ProcessState& AddProcessForSnapshot(const base::ProcessId process_id,
                                     StabilityReport* report) {
 #if DCHECK_IS_ON()
@@ -19,4 +20,5 @@ ProcessState& AddProcessForSnapshot(const base::ProcessId process_id,
   process_state->set_process_id(process_id);
   return *process_state;
 }
+#endif
 }  // namespace stability_report
index 6806cc8..b9569d3 100644 (file)
@@ -6,7 +6,9 @@
 #define COMPONENTS_STABILITY_REPORT_USER_STREAM_DATA_SOURCE_H_
 
 #include "base/process/process.h"
+#if !defined(BUILD_CHROME)
 #include "components/stability_report/stability_report.pb.h"
+#endif
 #include "third_party/crashpad/crashpad/handler/user_stream_data_source.h"
 
 namespace crashpad {
@@ -31,9 +33,11 @@ class UserStreamDataSource : public crashpad::UserStreamDataSource {
   ProduceStreamData(crashpad::ProcessSnapshot* process_snapshot) override = 0;
 };
 
+#if !defined(BUILD_CHROME)
 // Adds an entry for the given `process_id` to `report`.
 ProcessState& AddProcessForSnapshot(const base::ProcessId process_id,
                                     StabilityReport* report);
+#endif
 
 }  // namespace stability_report
 
index 6652043..bd33e83 100644 (file)
@@ -33,8 +33,10 @@ UserStreamDataSourcePosix::ProduceStreamData(
 
   StabilityReport report;
   const base::ProcessId process_id = process_snapshot->ProcessID();
+#if !defined(BUILD_CHROME)
   ProcessState& process_state = AddProcessForSnapshot(process_id, &report);
   CollectFileDescriptorInfo(process_state, process_id);
+#endif
 
   return std::make_unique<StabilityReportDataSource>(report);
 }
index 4f1e721..1e7df74 100644 (file)
@@ -76,7 +76,7 @@ static_library("storage_monitor") {
       ]
       deps += [ "//services/device/public/mojom" ]
     }
-  } else if (is_linux || is_chromeos_lacros) {
+  } else if (is_linux || is_chromeos_lacros || is_tizen) {
     if (use_udev) {
       sources += [
         "mtab_watcher_linux.cc",
index 7c1d7a2..784dca6 100644 (file)
@@ -8,5 +8,5 @@ declare_args() {
       # Platforms which fully support supervision features:
       is_android || is_chromeos ||
       # Platforms for which support is currently in development:
-      is_ios || is_linux || is_mac || is_win
+      is_ios || is_linux || is_mac || is_win || is_tizen
 }
index 26a121a..802fb92 100644 (file)
@@ -526,7 +526,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl<Response> {
   RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
   RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
 
-  void Start(ProtoFetcher<Response>::Callback callback) override {
+  void Start(typename ProtoFetcher<Response>::Callback callback) override {
     callback_ = std::move(callback);
     Retry();
   }
@@ -564,7 +564,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl<Response> {
   }
 
   // Client callback.
-  ProtoFetcher<Response>::Callback callback_;
+  typename ProtoFetcher<Response>::Callback callback_;
 
   // Retry controls.
   base::OneShotTimer timer_;
@@ -707,7 +707,7 @@ ParallelFetchManager<Request, Response>::ParallelFetchManager(
 template <typename Request, typename Response>
 void ParallelFetchManager<Request, Response>::Fetch(
     const Request& request,
-    Fetcher::Callback callback) {
+    typename Fetcher::Callback callback) {
   CHECK(callback) << "Use base::DoNothing() instead of empty callback.";
   KeyType key = requests_in_flight_.Add(MakeFetcher(request));
   requests_in_flight_.Lookup(key)->Start(
index 8266c99..9c41978 100644 (file)
@@ -165,10 +165,10 @@ class ParallelFetchManager {
 
   // Starts the fetch. Underlying fetcher is stored internally, and will be
   // cleaned up after finish or when this manager is destroyed.
-  void Fetch(const Request& request, Fetcher::Callback callback);
+  void Fetch(const Request& request, typename Fetcher::Callback callback);
 
  private:
-  using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
+  using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
 
   // Remove fetcher under key from requests_in_flight_.
   void Remove(KeyType key);
index 23b3747..bd2b8c5 100644 (file)
@@ -3569,7 +3569,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kDiscardableMemoryLimit,
     switches::kDiscardableMemoryPurgeDelay,
 #endif
-#if BUILDFLAG(IS_TIZEN_TV)
+#if BUILDFLAG(IS_TIZEN_TV) && !defined(BUILD_CHROME)
     switches::kTizenAppId,
 #endif
   };
index 84b3b64..913fd4d 100644 (file)
@@ -48,6 +48,11 @@ void FakeRenderWidgetHost::IntrinsicSizingInfoChanged(
 
 void FakeRenderWidgetHost::SetCursor(const ui::Cursor& cursor) {}
 
+#if BUILDFLAG(IS_TIZEN_TV)
+void FakeRenderWidgetHost::DidEdgeScrollBy(const ::gfx::Point& offset,
+                                           bool handled) {}
+#endif
+
 void FakeRenderWidgetHost::UpdateTooltipUnderCursor(
     const std::u16string& tooltip_text,
     base::i18n::TextDirection text_direction_hint) {}
index 12bfd4e..b286d8d 100644 (file)
@@ -58,6 +58,9 @@ class FakeRenderWidgetHost : public blink::mojom::FrameWidgetHost,
 
   // blink::mojom::WidgetHost overrides.
   void SetCursor(const ui::Cursor& cursor) override;
+#if BUILDFLAG(IS_TIZEN_TV)
+  void DidEdgeScrollBy(const ::gfx::Point& offset, bool handled) override;
+#endif
   void UpdateTooltipUnderCursor(
       const std::u16string& tooltip_text,
       base::i18n::TextDirection text_direction_hint) override;
index 2629d51..d6b3a88 100755 (executable)
@@ -736,8 +736,12 @@ install -m 0644 %{_libdir}/libscl-common.so        "%{buildroot}"%{_libdir}
 %endif
 
 install -m 0644 "%{OUTPUT_FOLDER}"/resources/*.edj "%{buildroot}"%{CHROMIUM_LIB_DIR}/res/themes/
+
+%if %{__build_chrome} != 1
 cp -r "%{OUTPUT_FOLDER}"/locale/* "%{buildroot}"%{CHROMIUM_LIB_DIR}/res/locale/
 chmod -R a=r,u+w,a+X              "%{buildroot}"%{CHROMIUM_LIB_DIR}/res/locale/*
+%endif
+
 %if "%{?__use_system_icu}" != "1"
   install -m 0644 "%{OUTPUT_FOLDER}"/icudtl.dat           "%{buildroot}"%{CHROMIUM_LIB_DIR}/bin/
 %endif
@@ -753,10 +757,12 @@ install -m 0644 "%{OUTPUT_FOLDER}"/tizen-manifest.xml "%{buildroot}"%{_xmldir}/%
   %define tizen_dist_sign 1
 %endif
 
+%if %{__build_chrome} != 1
 install -m 0644 "%{OUTPUT_FOLDER}"/images/*.png    "%{buildroot}"%{CHROMIUM_LIB_DIR}/res/images/
+%endif
+
 install -m 0644 "%{OUTPUT_FOLDER}"/resources/*.edj "%{buildroot}"%{CHROMIUM_LIB_DIR}/res/themes/
-cp -r "%{OUTPUT_FOLDER}"/locale/* "%{buildroot}"%{CHROMIUM_LIB_DIR}/res/locale/
-chmod -R a=r,u+w,a+X              "%{buildroot}"%{CHROMIUM_LIB_DIR}/res/locale/*
+
 %if "%{?__use_system_icu}" != "1"
   install -m 0644 "%{OUTPUT_FOLDER}"/icudtl.dat           "%{buildroot}"%{CHROMIUM_LIB_DIR}/bin/
 %endif
@@ -1063,7 +1069,6 @@ rm -rf %{CHROMIUM_TPK_DIR}/%{_tpk_file_name}.tpk
 %{CHROMIUM_LIB_DIR}/bin/content_shell.pak
 %{CHROMIUM_LIB_DIR}/bin/locales/*.pak
 %{CHROMIUM_LIB_DIR}/res/themes/*.edj
-%{CHROMIUM_LIB_DIR}/res/images/*.png
 
 %if %{__build_chrome} == 1
   %{CHROMIUM_LIB_DIR}/bin/chrome_100_percent.pak
@@ -1108,9 +1113,9 @@ rm -rf %{CHROMIUM_TPK_DIR}/%{_tpk_file_name}.tpk
   %else
     %{CHROMIUM_LIB_DIR}/lib/libchromium-ewk.so
   %endif
+  %{CHROMIUM_LIB_DIR}/res/images/*.png
 %endif
 
-%{CHROMIUM_LIB_DIR}/res/themes/*.edj
 %{CHROMIUM_LIB_DIR}/res/locale
 
 %if "%{?__use_system_icu}" != "1"
index 7a5288d..7f90f28 100644 (file)
@@ -17,5 +17,9 @@ declare_args() {
   # feature is enabled for the PDF viewer.
   enable_ink = enable_cros_media_app
 
+#if !defined(BUILD_CHROME)
   enable_pdf = !is_android && !is_ios && !is_castos
+#else
+  enable_pdf = !is_android && !is_ios && !is_castos && !is_tizen
+#endif
 }
index fa9004e..8948220 100644 (file)
@@ -11,7 +11,11 @@ import("//pdf/features.gni")
 
 declare_args() {
   # Enables printing support.
+#if defined(BUILD_CHROME)
+  enable_printing = !is_ios && !is_castos && !is_cast_android  && !is_tizen
+#else
   enable_printing = !is_ios && !is_castos && !is_cast_android
+#endif
 
   # TODO(crbug.com/1432082): iOS blink port only enables printing_unittests for
   # now because the port does not enable the printing feature yet.
index cf3b855..6ef49eb 100644 (file)
@@ -198,7 +198,7 @@ LocationArbitrator::NewNetworkLocationProvider(
 
 std::unique_ptr<LocationProvider>
 LocationArbitrator::NewSystemLocationProvider() {
-#if BUILDFLAG(IS_TIZEN)
+#if BUILDFLAG(IS_TIZEN) && !defined(BUILD_CHROME)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableOffscreenRendering)) {
     return device::NewSystemLocationProvider(main_task_runner_,
index a5f442b..843b04e 100644 (file)
@@ -116,7 +116,7 @@ enum MinidumpStreamType : uint32_t {
 //!     file.
 //!
 //! \sa MINIDUMP_STRING
-struct ALIGNAS(4) PACKED MinidumpUTF8String {
+struct PACKED MinidumpUTF8String {
   // The field names do not conform to typical style, they match the names used
   // in MINIDUMP_STRING. This makes it easier to operate on MINIDUMP_STRING (for
   // UTF-16 strings) and MinidumpUTF8String using templates.
@@ -135,7 +135,7 @@ struct ALIGNAS(4) PACKED MinidumpUTF8String {
 //! \brief A variable-length array of bytes carried within a minidump file.
 //!     The data have no intrinsic type and should be interpreted according
 //!     to their referencing context.
-struct ALIGNAS(4) PACKED MinidumpByteArray {
+struct PACKED MinidumpByteArray {
   //! \brief The length of the #data field.
   uint32_t length;
 
@@ -273,7 +273,7 @@ enum MinidumpOS : uint32_t {
 };
 
 //! \brief A list of ::RVA pointers.
-struct ALIGNAS(4) PACKED MinidumpRVAList {
+struct PACKED MinidumpRVAList {
   //! \brief The number of children present in the #children array.
   uint32_t count;
 
@@ -282,7 +282,7 @@ struct ALIGNAS(4) PACKED MinidumpRVAList {
 };
 
 //! \brief A key-value pair.
-struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionaryEntry {
+struct PACKED MinidumpSimpleStringDictionaryEntry {
   //! \brief ::RVA of a MinidumpUTF8String containing the key of a key-value
   //!     pair.
   RVA key;
@@ -293,7 +293,7 @@ struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionaryEntry {
 };
 
 //! \brief A list of key-value pairs.
-struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionary {
+struct PACKED MinidumpSimpleStringDictionary {
   //! \brief The number of key-value pairs present.
   uint32_t count;
 
@@ -302,7 +302,7 @@ struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionary {
 };
 
 //! \brief A typed annotation object.
-struct ALIGNAS(4) PACKED MinidumpAnnotation {
+struct PACKED MinidumpAnnotation {
   //! \brief ::RVA of a MinidumpUTF8String containing the name of the
   //!     annotation.
   RVA name;
@@ -319,7 +319,7 @@ struct ALIGNAS(4) PACKED MinidumpAnnotation {
 };
 
 //! \brief A list of annotation objects.
-struct ALIGNAS(4) PACKED MinidumpAnnotationList {
+struct PACKED MinidumpAnnotationList {
   //! \brief The number of annotation objects present.
   uint32_t count;
 
@@ -342,7 +342,7 @@ struct ALIGNAS(4) PACKED MinidumpAnnotationList {
 //! fields are valid or not.
 //!
 //! \sa MinidumpModuleCrashpadInfoList
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfo {
+struct PACKED MinidumpModuleCrashpadInfo {
   //! \brief The structure’s currently-defined version number.
   //!
   //! \sa version
@@ -392,7 +392,7 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfo {
 //! \brief A link between a MINIDUMP_MODULE structure and additional
 //!     Crashpad-specific information about a module carried within a minidump
 //!     file.
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoLink {
+struct PACKED MinidumpModuleCrashpadInfoLink {
   //! \brief A link to a MINIDUMP_MODULE structure in the module list stream.
   //!
   //! This field is an index into MINIDUMP_MODULE_LIST::Modules. This field’s
@@ -419,7 +419,7 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoLink {
 //! structure carried within the minidump file will necessarily have
 //! Crashpad-specific information provided by a MinidumpModuleCrashpadInfo
 //! structure.
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoList {
+struct PACKED MinidumpModuleCrashpadInfoList {
   //! \brief The number of children present in the #modules array.
   uint32_t count;
 
@@ -438,7 +438,7 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoList {
 //! structure. Revise #kVersion and document each field’s validity based on
 //! #version, so that newer parsers will be able to determine whether the added
 //! fields are valid or not.
-struct ALIGNAS(4) PACKED MinidumpCrashpadInfo {
+struct PACKED MinidumpCrashpadInfo {
   // UUID has a constructor, which makes it non-POD, which makes this structure
   // non-POD. In order for the default constructor to zero-initialize other
   // members, an explicit constructor must be provided.
index c87a5c3..7df87ec 100644 (file)
@@ -1242,7 +1242,7 @@ inline int queryTopLevelCacheSize()
  * This wraps C++20's std::construct_at, using placement new instead if it is not available.
  */
 
-#if EIGEN_COMP_CXXVER >= 20
+#if EIGEN_COMP_CXXVER >= 20 && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 using std::construct_at;
 #else
 template<class T, class... Args>
index 8e4c278..ec8baa4 100644 (file)
@@ -249,8 +249,13 @@ EIGEN_CONSTEXPR std::ptrdiff_t index_list_size(const T (&)[N]) { return N; }
 #else
 template <typename T>
 EIGEN_CONSTEXPR auto index_list_size(T&& x) {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   using std::ssize;
   return ssize(std::forward<T>(x));
+#else
+  using std::size;
+  return size(std::forward<T>(x));
+#endif
 }
 #endif // EIGEN_COMP_CXXVER
 
index fd3a8cd..bca3923 100644 (file)
@@ -52,7 +52,9 @@
 
 #if defined(FLATBUFFERS_USE_STD_SPAN)
   #include <array>
-  #include <span>
+  #if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+    #include <span>
+  #endif
 #else
   // Disable non-trivial ctors if FLATBUFFERS_SPAN_MINIMAL defined.
   #if !defined(FLATBUFFERS_TEMPLATES_ALIASES)
@@ -278,7 +280,7 @@ FLATBUFFERS_CONSTEXPR_CPP11 bool operator==(const Optional<T>& lhs, const Option
 
 
 // Very limited and naive partial implementation of C++20 std::span<T,Extent>.
-#if defined(FLATBUFFERS_USE_STD_SPAN)
+#if defined(FLATBUFFERS_USE_STD_SPAN) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   inline constexpr std::size_t dynamic_extent = std::dynamic_extent;
   template<class T, std::size_t Extent = std::dynamic_extent>
   using span = std::span<T, Extent>;
@@ -470,7 +472,7 @@ class span FLATBUFFERS_FINAL_CLASS {
 };
 #endif  // defined(FLATBUFFERS_USE_STD_SPAN)
 
-#if !defined(FLATBUFFERS_SPAN_MINIMAL)
+#if !defined(FLATBUFFERS_SPAN_MINIMAL) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 template<class ElementType, std::size_t Extent>
 FLATBUFFERS_CONSTEXPR_CPP11
 flatbuffers::span<ElementType, Extent> make_span(ElementType(&arr)[Extent]) FLATBUFFERS_NOEXCEPT {
index d86c2f6..32ca970 100644 (file)
@@ -491,7 +491,11 @@ void CPDF_RenderStatus::ProcessClipPath(const CPDF_ClipPath& ClipPath,
     } else {
       m_pDevice->SetClip_PathFill(
           *pPath, &mtObj2Device,
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
           CFX_FillRenderOptions(ClipPath.GetClipType(i)));
+#else
+          {.fill_type = ClipPath.GetClipType(i)});
+#endif
     }
   }
 
index dc73ed0..4915215 100644 (file)
@@ -28,7 +28,7 @@
 #endif
 
 #if BUILDFLAG(IS_TIZEN_TV)
-#include "tizen_src/ewk/efl_integration/common/application_type.h"
+#include "third_party/blink/public/platform/web_application_type.h"
 #endif
 
 namespace ui {
@@ -601,7 +601,7 @@ void EflEventHandler::OnKeyDown(void* data,
     // In non webapp scene,"Cancel" key haven't added on the map,the keycode is
     // 0. "Cancel" key is delivered by IME, for hiding IME panel,no need deliver
     // the key event. Or else,the keycode 0 may exception handling by website.
-    if (!strcmp(key_down->key, "Cancel") && !content::IsTIZENWRT())
+    if (!strcmp(key_down->key, "Cancel") && !blink::IsTIZENWRT())
       return;
   }
 #endif
@@ -663,7 +663,7 @@ void EflEventHandler::OnKeyUp(void* data,
     // In non webapp scene,"Cancel" key haven't added on the map,the keycode is
     // 0. "Cancel" key is delivered by IME, for hiding IME panel,no need deliver
     // the key event. Or else,the keycode 0 may exception handling by website.
-    if (!strcmp(key_up->key, "Cancel") && !content::IsTIZENWRT())
+    if (!strcmp(key_up->key, "Cancel") && !blink::IsTIZENWRT())
       return;
 #endif
   }
@@ -782,7 +782,7 @@ void EflEventHandler::ConvertUpToReturnBackIfNeeded(EVT* evt, bool is_press) {
     was_up_keypress_on_ime_top_ = false;
   }
 
-  if (content::IsWebBrowser() || content::IsTIZENWRT()) {
+  if (blink::IsWebBrowser() || blink::IsTIZENWRT()) {
     evt->keyname = (char*)"Cancel"; /*Return Back key name*/
     evt->key = (char*)"Cancel";     /*Return Back key*/
     evt->string = (char*)"";        /*Return Back string*/
index 3f6b6a7..7a438ec 100644 (file)
@@ -18,7 +18,7 @@
 #include "ui/ozone/platform/efl/efl_window.h"
 
 #if BUILDFLAG(IS_TIZEN_TV)
-#include "tizen_src/ewk/efl_integration/common/application_type.h"
+#include "third_party/blink/public/platform/web_application_type.h"
 #endif
 
 #ifdef IM_CTX_DEBUG
@@ -252,7 +252,7 @@ void IMContextEfl::UpdateInputMethodType(TextInputType type,
 
 #if BUILDFLAG(IS_TIZEN_TV)
   // 2017 WebBrowser App want no recommended list same as 2015, 2016.
-  if (content::IsWebBrowser())
+  if (blink::IsWebBrowser())
     allow_prediction = false;
 
   // Always enable "Up" and "Down" key
@@ -520,7 +520,7 @@ void IMContextEfl::SendFakeCompositionKeyEvent(const std::u16string& buf) {
     event.set_key_code(static_cast<KeyboardCode>(229));
 
 #if BUILDFLAG(IS_TIZEN_TV)
-  if (content::IsTIZENWRT()) {
+  if (blink::IsTIZENWRT()) {
     // a-z, A-Z, 0-9
     int key_code = event.key_code();
     if ((key_code >= 65 && key_code <= 90) ||
index 2efa825..a3fa15f 100644 (file)
 namespace ui::wayland {
 
 // A 2.4 gamma for the BT2087 transfer function.
-static constexpr skcms_TransferFunction gamma24 = {2.4f, 1.f};
-constexpr uint32_t kDefaultSinceVersion = 1;
+static const skcms_TransferFunction gamma24 = {2.4f, 1.f};
+const uint32_t kDefaultSinceVersion = 1;
 
 // These structs are used for holding ColorSpace enums, and the version of the
 // color management protocol their support was introduced.
 struct TransferFnVersion {
   skcms_TransferFunction transfer_fn;
   uint32_t version;
+  TransferFnVersion(skcms_TransferFunction transfer_fn, uint32_t version)
+      : transfer_fn(transfer_fn), version(version) {}
 };
 
 struct TransferVersion {
   gfx::ColorSpace::TransferID transfer;
   uint32_t version;
+  TransferVersion(gfx::ColorSpace::TransferID transfer, uint32_t version)
+      : transfer(transfer), version(version) {}
 };
 
 struct PrimaryVersion {
   gfx::ColorSpace::PrimaryID primary;
   uint32_t version;
+  PrimaryVersion(gfx::ColorSpace::PrimaryID primary, uint32_t version)
+      : primary(primary), version(version) {}
 };
 
 struct MatrixVersion {
   gfx::ColorSpace::MatrixID matrix;
   uint32_t version;
+  MatrixVersion(gfx::ColorSpace::MatrixID matrix, uint32_t version)
+      : matrix(matrix), version(version) {}
 };
 
 struct RangeVersion {
   gfx::ColorSpace::RangeID range;
   uint32_t version;
+  RangeVersion(gfx::ColorSpace::RangeID range, uint32_t version)
+      : range(range), version(version) {}
 };
 
 // A map from the zcr_color_manager_v1 chromaticity_names enum values
 // representing well-known chromaticities, to their equivalent PrimaryIDs.
 // See components/exo/wayland/protocol/chrome-color-management.xml
-constexpr auto kChromaticityMap = base::MakeFixedFlatMap<
+const auto kChromaticityMap = base::MakeFixedFlatMap<
     zcr_color_manager_v1_chromaticity_names,
     PrimaryVersion>(
     {{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_525_LINE,
@@ -103,9 +113,8 @@ constexpr auto kChromaticityMap = base::MakeFixedFlatMap<
 // A map from the zcr_color_manager_v1 eotf_names enum values
 // representing well-known EOTFs, to their equivalent TransferIDs.
 // See components/exo/wayland/protocol/chrome-color-management.xml
-constexpr auto kEotfMap = base::MakeFixedFlatMap<
-    zcr_color_manager_v1_eotf_names,
-    TransferVersion>({
+const auto kEotfMap = base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names,
+                                             TransferVersion>({
     {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
      TransferVersion(gfx::ColorSpace::TransferID::LINEAR,
                      kDefaultSinceVersion)},
@@ -174,7 +183,7 @@ constexpr auto kEotfMap = base::MakeFixedFlatMap<
 // A map from the SDR zcr_color_manager_v1 eotf_names enum values
 // representing well-known EOTFs, to their equivalent transfer functions.
 // See components/exo/wayland/protocol/chrome-color-management.xml
-constexpr auto kTransferMap =
+const auto kTransferMap =
     base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>({
         {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
          TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
@@ -194,7 +203,7 @@ constexpr auto kTransferMap =
 // A map from the HDR zcr_color_manager_v1 eotf_names enum values
 // representing well-known EOTFs, to their equivalent transfer functions.
 // See components/exo/wayland/protocol/chrome-color-management.xml
-constexpr auto kHDRTransferMap =
+const auto kHDRTransferMap =
     base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>(
         {{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
           TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
@@ -214,7 +223,7 @@ constexpr auto kHDRTransferMap =
 
 // A map from zcr_color_manager_v1 matrix_names enum values to
 // gfx::ColorSpace::MatrixIDs.
-constexpr auto kMatrixMap =
+const auto kMatrixMap =
     base::MakeFixedFlatMap<zcr_color_manager_v1_matrix_names, MatrixVersion>(
         {{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_RGB,
           MatrixVersion(gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion)},
@@ -251,7 +260,7 @@ constexpr auto kMatrixMap =
 
 // A map from zcr_color_manager_v1 range_names enum values to
 // gfx::ColorSpace::RangeIDs.
-constexpr auto kRangeMap =
+const auto kRangeMap =
     base::MakeFixedFlatMap<zcr_color_manager_v1_range_names, RangeVersion>(
         {{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_LIMITED,
           RangeVersion(gfx::ColorSpace::RangeID::LIMITED,
@@ -283,4 +292,4 @@ zcr_color_manager_v1_eotf_names ToColorManagerEOTF(gfx::ColorSpace color_space,
 
 }  // namespace ui::wayland
 
-#endif  // UI_BASE_WAYLAND_COLOR_MANAGER_UTIL_H_
\ No newline at end of file
+#endif  // UI_BASE_WAYLAND_COLOR_MANAGER_UTIL_H_
index 3d59a4c..e0bc1b3 100644 (file)
@@ -318,7 +318,7 @@ source_set("wayland") {
     "//ui/platform_window/wm",
   ]
 
-  if (is_linux) {
+  if (is_linux || is_tizen) {
     sources += [
       "host/linux_ui_delegate_wayland.cc",
       "host/linux_ui_delegate_wayland.h",
@@ -344,7 +344,7 @@ source_set("wayland") {
     ]
   }
 
-  if (is_linux) {
+  if (is_linux || is_tizen) {
     sources += [
       "host/wayland_async_cursor.cc",
       "host/wayland_async_cursor.h",