[M120][Tizen][Offscreen] Fix build errors for TV profile 56/302956/16
authorSuhaspoornachandra <s.poornachan@samsung.com>
Thu, 28 Dec 2023 08:12:34 +0000 (13:42 +0530)
committerSuhaspoornachandra <s.poornachan@samsung.com>
Mon, 8 Jan 2024 06:09:09 +0000 (11:39 +0530)
This patch fixes TV Offscreen build issues for M120

Change-Id: Ida9265cacd16a9fecc9fac4de014ee238d4ff905
Signed-off-by: v-saha <v.saha@samsung.com>
Signed-off-by: Suhaspoornachandra <s.poornachan@samsung.com>
96 files changed:
base/BUILD.gn
base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h
base/compiler_specific.h
base/containers/map_util.h
base/metrics/persistent_histogram_allocator.cc
build/nocompile.gni
cc/paint/paint_op_writer.h
chrome/browser/net/system_network_context_manager.h
chrome/utility/safe_browsing/BUILD.gn
components/attribution_reporting/trigger_registration.cc
components/autofill/core/browser/contact_info_sync_util.cc
components/autofill/core/browser/data_model/autofill_i18n_api.cc
components/autofill/core/browser/data_model/autofill_i18n_api.h
components/autofill/core/browser/data_model/autofill_profile.h
components/autofill/core/browser/payments/iban_save_manager.cc
components/autofill/core/browser/webdata/autofill_table.cc
components/download/public/common/download_save_item_data.h
components/password_manager/core/browser/password_manager.cc
components/viz/service/display/surface_aggregator.cc
components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
content/browser/BUILD.gn
content/browser/download/save_package.cc
content/browser/generic_sensor/frame_sensor_provider_proxy.cc
content/browser/interest_group/header_direct_from_seller_signals.h
content/browser/interest_group/interest_group_storage.cc
content/browser/interest_group/storage_interest_group.h
content/browser/renderer_host/render_frame_host_impl.cc
content/common/BUILD.gn
content/gpu/gpu_child_thread.cc
content/gpu/gpu_main.cc
content/public/browser/web_ui_browser_interface_broker_registry.h
content/renderer/render_thread_impl.cc
content/renderer/renderer_blink_platform_impl.cc
content/renderer/renderer_blink_platform_impl.h
content/renderer/renderer_main.cc
content/test/BUILD.gn
content/utility/services.cc
content/utility/utility_main.cc
content/utility/utility_thread_impl.cc
gpu/command_buffer/service/shared_image/shared_image_backing.h
gpu/vulkan/semaphore_handle.h
gpu/vulkan/vulkan_implementation.h
media/capture/video/linux/v4l2_capture_delegate.cc
media/capture/video/linux/v4l2_capture_delegate.h
media/capture/video/video_capture_buffer_tracker_factory_impl.cc
media/filters/source_buffer_range.cc
mojo/public/cpp/bindings/lib/multiplex_router.h
net/cert/cert_database.cc
net/cert/ev_root_ca_metadata.cc
net/cert/internal/system_trust_store.cc
net/cert/internal/system_trust_store.h
net/cert/x509_cert_types.cc
net/cert/x509_cert_types.h
net/dns/host_resolver_cache.h
net/features.gni
net/http/http_auth_preferences.cc
net/http/http_auth_preferences.h
packaging/chromium-efl.spec
sandbox/linux/syscall_broker/remote_syscall_arg_handler.cc
services/network/network_context.cc
services/network/network_context.h
services/network/network_service.cc
services/network/network_service.h
services/video_capture/video_capture_service_impl.cc
services/video_capture/video_capture_service_impl.h
third_party/blink/renderer/bindings/core/v8/async_iterable.h
third_party/blink/renderer/build/scripts/core/style/templates/computed_style_base.h.tmpl
third_party/blink/renderer/core/BUILD.gn
third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc
third_party/blink/renderer/core/loader/history_item.h
third_party/blink/renderer/core/paint/fragment_data_iterator.h
third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc
third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h
third_party/blink/renderer/platform/fonts/font_palette.h
third_party/blink/renderer/platform/fonts/palette_interpolation.cc
third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc
third_party/material_color_utilities/src/cpp/palettes/tones.cc
third_party/perfetto/src/trace_processor/perfetto_sql/engine/created_function.cc
third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h
tizen_src/build/config/tizen_features.gni
tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.cc
tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.h
tizen_src/ewk/efl_integration/content_browser_client_efl.cc
tizen_src/ewk/efl_integration/content_browser_client_efl.h
ui/base/clipboard/clipboard.h
ui/base/interaction/interactive_test.h
ui/base/interaction/interactive_test_internal.h
ui/color/dynamic_color/palette_factory.cc
ui/events/keycodes/keyboard_codes_posix.h
ui/gl/gl_fence.cc
ui/views/interaction/interactive_views_test.h
v8/src/objects/object-macros.h

index 4945449..a81da21 100644 (file)
@@ -2207,7 +2207,7 @@ component("base") {
   }
 
   # Linux.
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     # TODO(brettw) this will need to be parameterized at some point.
     linux_configs = []
     if (use_glib) {
index 30be67c..5687623 100644 (file)
@@ -24,7 +24,7 @@
 // Annotate a function indicating it should not be inlined.
 // Use like:
 //   NOINLINE void DoStuff() { ... }
-#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline)
+#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline) && !BUILDFLAG(IS_TIZEN)
 #define PA_NOINLINE [[clang::noinline]]
 #elif defined(COMPILER_GCC) && PA_HAS_ATTRIBUTE(noinline)
 #define PA_NOINLINE __attribute__((noinline))
@@ -34,7 +34,8 @@
 #define PA_NOINLINE
 #endif
 
-#if defined(__clang__) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
+#if defined(__clang__) && defined(NDEBUG) && \
+    PA_HAS_ATTRIBUTE(always_inline) && !BUILDFLAG(IS_TIZEN)
 #define PA_ALWAYS_INLINE [[clang::always_inline]] inline
 #elif defined(COMPILER_GCC) && defined(NDEBUG) && \
     PA_HAS_ATTRIBUTE(always_inline)
@@ -53,7 +54,8 @@
 // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
 // Use like:
 //   void NOT_TAIL_CALLED FooBar();
-#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called)
+#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called) && \
+    !BUILDFLAG(IS_TIZEN)
 #define PA_NOT_TAIL_CALLED [[clang::not_tail_called]]
 #else
 #define PA_NOT_TAIL_CALLED
@@ -181,7 +183,8 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
 #endif  // defined(__clang_analyzer__)
 
 // Use nomerge attribute to disable optimization of merging multiple same calls.
-#if defined(__clang__) && PA_HAS_ATTRIBUTE(nomerge)
+// FIXME: Enable for tizen if clang supports nomerge attribute.
+#if defined(__clang__) && PA_HAS_ATTRIBUTE(nomerge) && !BUILDFLAG(IS_TIZEN)
 #define PA_NOMERGE [[clang::nomerge]]
 #else
 #define PA_NOMERGE
index 3644afa..fb8a642 100644 (file)
@@ -5,7 +5,6 @@
 #ifndef BASE_ALLOCATOR_PARTITION_ALLOCATOR_SRC_PARTITION_ALLOC_PARTITION_ALLOC_BASE_STRINGS_SAFE_SPRINTF_H_
 #define BASE_ALLOCATOR_PARTITION_ALLOCATOR_SRC_PARTITION_ALLOC_PARTITION_ALLOC_BASE_STRINGS_SAFE_SPRINTF_H_
 
-#include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <unistd.h>
 #endif
 
+#if BUILDFLAG(IS_EFL)
+#include <cstddef>
+#else
+#include <stddef.h>
+#endif
+
 #include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/component_export.h"
 
 namespace partition_alloc::internal::base::strings {
@@ -178,18 +183,20 @@ struct Arg {
     integer.width = sizeof(long long);
   }
 
-  // nullptr_t would be ambiguous between char* and const char*; to get
+  // std::nullptr_t would be ambiguous between char* and const char*; to get
   // consistent behavior with NULL, which prints with all three of %d, %p, and
   // %s, treat it as an integer zero internally.
   //
   // Warning: don't just do Arg(NULL) here because in some libcs, NULL is an
-  // alias for nullptr!
-  Arg(nullptr_t p) : type(INT) {
+  // alias for std::nullptr!
+  //
+  // NOLINTNEXTLINE(runtime/explicit)
+  Arg(std::nullptr_t p) : type(INT) {
     integer.i = 0;
     // Internally, SafeSprintf expects to represent nulls as integers whose
     // width is equal to sizeof(NULL), which is not necessarily equal to
-    // sizeof(nullptr_t) - eg, on Windows, NULL is defined to 0 (with size 4)
-    // while nullptr_t is of size 8.
+    // sizeof(std::nullptr_t) - eg, on Windows, NULL is defined to 0 (with size
+    // 4) while std::nullptr_t is of size 8.
     integer.width = sizeof(NULL);
   }
 
index 31a9334..8cb8394 100644 (file)
@@ -41,7 +41,7 @@
 // Annotate a function indicating it should not be inlined.
 // Use like:
 //   NOINLINE void DoStuff() { ... }
-#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
+#if defined(__clang__) && HAS_ATTRIBUTE(noinline) && !BUILDFLAG(IS_TIZEN)
 #define NOINLINE [[clang::noinline]]
 #elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
 #define NOINLINE __attribute__((noinline))
@@ -51,7 +51,8 @@
 #define NOINLINE
 #endif
 
-#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
+#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) && \
+    !BUILDFLAG(IS_TIZEN)
 #define ALWAYS_INLINE [[clang::always_inline]] inline
 #elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
 #define ALWAYS_INLINE inline __attribute__((__always_inline__))
@@ -69,7 +70,7 @@
 // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
 // Use like:
 //   NOT_TAIL_CALLED void FooBar();
-#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called)
+#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called) && !BUILDFLAG(IS_TIZEN)
 #define NOT_TAIL_CALLED [[clang::not_tail_called]]
 #else
 #define NOT_TAIL_CALLED
index 35ce4d7..6bdc2f4 100644 (file)
@@ -41,8 +41,8 @@ constexpr internal::MappedType<Map>* FindOrNull(Map& map, const Key& key) {
 // to a null value.
 template <typename Map,
           typename Key,
-          typename MappedElementType =
-              std::pointer_traits<internal::MappedType<Map>>::element_type>
+          typename MappedElementType = typename std::pointer_traits<
+              internal::MappedType<Map>>::element_type>
 constexpr const MappedElementType* FindPtrOrNull(const Map& map,
                                                  const Key& key) {
   auto it = map.find(key);
@@ -57,8 +57,8 @@ constexpr const MappedElementType* FindPtrOrNull(const Map& map,
 // to a null value.
 template <typename Map,
           typename Key,
-          typename MappedElementType =
-              std::pointer_traits<internal::MappedType<Map>>::element_type>
+          typename MappedElementType = typename std::pointer_traits<
+              internal::MappedType<Map>>::element_type>
 constexpr MappedElementType* FindPtrOrNull(Map& map, const Key& key) {
   auto it = map.find(key);
   return it != map.end() ? std::to_address(it->second) : nullptr;
index a3c8a1c..1578923 100644 (file)
@@ -218,13 +218,13 @@ PersistentSparseHistogramDataManager::LoadRecords(
     // The sample-record could be for any sparse histogram. Add the reference
     // to the appropriate collection for later use.
     if (found_id == match_id) {
-      found_records.emplace_back(ref, value);
+      found_records.emplace_back(ReferenceAndSample{ref, value});
       found = true;
     } else {
       std::vector<ReferenceAndSample>* samples =
           GetSampleMapRecordsWhileLocked(found_id);
       CHECK(samples);
-      samples->emplace_back(ref, value);
+      samples->emplace_back(ReferenceAndSample{ref, value});
     }
   }
 
index 05e7a42..9ed7edf 100644 (file)
@@ -57,7 +57,7 @@ if (is_win) {
 declare_args() {
   enable_nocompile_tests = (is_linux || is_chromeos || is_apple || is_win) &&
                            is_clang && host_cpu == target_cpu
-  enable_nocompile_tests_new = is_clang && !is_nacl
+  enable_nocompile_tests_new = is_clang && !is_nacl && !is_tizen
 }
 
 if (enable_nocompile_tests_new) {
index 26bb335..7eb84df 100644 (file)
@@ -111,9 +111,23 @@ class CC_PAINT_EXPORT PaintOpWriter {
   static constexpr size_t kDefaultAlignment = alignof(uint32_t);
 
  private:
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   template <typename T>
   static constexpr size_t SerializedSizeSimple();
+#else
+  template <typename T>
+  static constexpr size_t SerializedSizeSimple() {
+    static_assert(!std::is_pointer_v<T>);
+    return base::bits::AlignUp(sizeof(T), kDefaultAlignment);
+  }
 
+  // size_t is always serialized as two uint32_ts to make the serialized result
+  // portable between 32bit and 64bit processes.
+  template <>
+  constexpr size_t SerializedSizeSimple<size_t>() {
+    return base::bits::AlignUp(2 * sizeof(uint32_t), kDefaultAlignment);
+  }
+#endif
  public:
   // SerializedSize() returns the maximum serialized size of the given type or
   // the given parameter. For a buffer to contain serialization of multiple
@@ -122,10 +136,24 @@ class CC_PAINT_EXPORT PaintOpWriter {
   // easier to keep serialized size calculation in sync with serialization and
   // deserialization, and make it possible to allow dynamic sizing for some
   // data types (see the specialized/overloaded functions).
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   template <typename T>
   static constexpr size_t SerializedSize();
   template <typename T>
   static constexpr size_t SerializedSize(const T& data);
+#else
+  template <typename T>
+  static constexpr size_t SerializedSize() {
+    static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>);
+    return SerializedSizeSimple<T>();
+  }
+  template <typename T>
+  static constexpr size_t SerializedSize(const T& data) {
+    return SerializedSizeSimple<T>();
+  }
+
+#endif
+
   static size_t SerializedSize(const PaintImage& image);
   static size_t SerializedSize(const PaintRecord& record);
   static size_t SerializedSize(const SkHighContrastConfig& config);
@@ -437,6 +465,7 @@ class CC_PAINT_EXPORT PaintOpWriter {
   const bool enable_security_constraints_;
 };
 
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 template <typename T>
 constexpr size_t PaintOpWriter::SerializedSizeSimple() {
   static_assert(!std::is_pointer_v<T>);
@@ -449,6 +478,7 @@ template <>
 constexpr size_t PaintOpWriter::SerializedSizeSimple<size_t>() {
   return base::bits::AlignUp(2 * sizeof(uint32_t), kDefaultAlignment);
 }
+#endif
 
 template <>
 constexpr size_t PaintOpWriter::SerializedSize<SkGainmapInfo>() {
@@ -462,6 +492,7 @@ constexpr size_t PaintOpWriter::SerializedSize<SkGainmapInfo>() {
          SerializedSizeSimple<uint32_t>();    // fBaseImageType
 }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 template <typename T>
 constexpr size_t PaintOpWriter::SerializedSize() {
   static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>);
@@ -471,6 +502,7 @@ template <typename T>
 constexpr size_t PaintOpWriter::SerializedSize(const T& data) {
   return SerializedSizeSimple<T>();
 }
+#endif
 
 }  // namespace cc
 
index 701331b..604f73f 100644 (file)
@@ -185,7 +185,7 @@ class SystemNetworkContextManager {
   class URLLoaderFactoryForSystem;
   class NetworkProcessLaunchWatcher;
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
   class GssapiLibraryLoadObserver
       : public network::mojom::GssapiLibraryLoadObserver {
    public:
@@ -277,7 +277,7 @@ class SystemNetworkContextManager {
 
   static absl::optional<bool> certificate_transparency_enabled_for_testing_;
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
   GssapiLibraryLoadObserver gssapi_library_loader_observer_{this};
 #endif  // BUILDFLAG(IS_LINUX)
 };
index 4050fb8..e78f4ea 100644 (file)
@@ -4,7 +4,7 @@
 
 import("//components/safe_browsing/buildflags.gni")
 
-if (is_linux || is_win) {
+if (is_linux || is_win || is_tizen) {
   source_set("document_analyzer") {
     sources = [
       "document_analyzer.cc",
index 4f0f0b5..35e0234 100644 (file)
@@ -109,8 +109,16 @@ base::expected<std::vector<T>, TriggerRegistrationError> ParseList(
   vec.reserve(list->size());
 
   for (auto& value : *list) {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     ASSIGN_OR_RETURN(T element, build_element(value));
     vec.push_back(std::move(element));
+#else
+    base::expected<T, TriggerRegistrationError> element = build_element(value);
+    if (!element.has_value()) {
+      return base::unexpected(element.error());
+    }
+    vec.push_back(std::move(*element));
+#endif
   }
 
   return vec;
index b5b0a0b..63ff178 100644 (file)
@@ -195,9 +195,11 @@ class ContactInfoProfileSetter {
       CHECK(observations.empty());
       for (const sync_pb::ContactInfoSpecifics::Observation& proto_observation :
            metadata.observations()) {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
         observations.emplace_back(proto_observation.type(),
                                   ProfileTokenQuality::FormSignatureHash(
                                       proto_observation.form_hash()));
+#endif
       }
     }
   }
index cae6455..6de0e73 100644 (file)
@@ -180,16 +180,24 @@ TreeEdgesList GetTreeEdges(AddressCountryCode country_code) {
   // Always use legacy rules while `kAutofillUseI18nAddressModel` is not rolled
   // out.
   if (!base::FeatureList::IsEnabled(features::kAutofillUseI18nAddressModel)) {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     return kAutofillModelRules.find(kLegacyHierarchyCountryCode.value())
         ->second;
+#else
+    return kAutofillModelRules.find(kLegacyHierarchyCountryCode)->second;
+#endif
   }
 
   auto* it = kAutofillModelRules.find(country_code.value());
 
   // If the entry is not defined, use the legacy rules.
   return it == kAutofillModelRules.end()
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
              ? kAutofillModelRules.find(kLegacyHierarchyCountryCode.value())
                    ->second
+#else
+             ? kAutofillModelRules.find(kLegacyHierarchyCountryCode)->second
+#endif
              : it->second;
 }
 
@@ -209,7 +217,12 @@ std::unique_ptr<AddressComponent> CreateAddressComponentModel(
 
   auto result = BuildSubTree(tree_def, ADDRESS_HOME_ADDRESS);
 
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   if (!country_code->empty() && country_code != kLegacyHierarchyCountryCode) {
+#else
+  if (!country_code->empty() &&
+      country_code.value() != kLegacyHierarchyCountryCode) {
+#endif
     // Set the address model country to the one requested.
     result->SetValueForType(ADDRESS_HOME_COUNTRY,
                             base::UTF8ToUTF16(country_code.value()),
@@ -234,8 +247,15 @@ std::u16string GetFormattingExpression(ServerFieldType field_type,
     }
 
     // Otherwise return a legacy formatting expression that exists.
-    auto* legacy_it = kAutofillFormattingRulesMap.find(
-        {kLegacyHierarchyCountryCode.value(), field_type});
+    auto* legacy_it = kAutofillFormattingRulesMap.find({
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+      kLegacyHierarchyCountryCode.value()
+#else
+      kLegacyHierarchyCountryCode
+#endif
+          ,
+          field_type
+    });
     return legacy_it != kAutofillFormattingRulesMap.end()
                ? std::u16string(legacy_it->second)
                : u"";
@@ -256,7 +276,11 @@ i18n_model_definition::ValueParsingResults ParseValueByI18nRegularExpression(
   AddressCountryCode country_code_for_parsing =
       IsCustomHierarchyAvailableForCountry(country_code)
           ? country_code
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
           : kLegacyHierarchyCountryCode;
+#else
+          : AddressCountryCode(" ");
+#endif
 
   auto* it = kAutofillParsingRulesMap.find(
       {country_code_for_parsing.value(), field_type});
@@ -283,7 +307,12 @@ bool IsTypeEnabledForCountry(ServerFieldType field_type,
 }
 
 bool IsCustomHierarchyAvailableForCountry(AddressCountryCode country_code) {
-  if (country_code->empty() || country_code == kLegacyHierarchyCountryCode ||
+  if (country_code->empty() ||
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+      country_code == kLegacyHierarchyCountryCode ||
+#else
+      country_code.value() == kLegacyHierarchyCountryCode ||
+#endif
       !base::FeatureList::IsEnabled(features::kAutofillUseI18nAddressModel)) {
     return false;
   }
index cf604d5..3a02e22 100644 (file)
@@ -15,9 +15,13 @@ namespace autofill::i18n_model_definition {
 // Country code that represents autofill's legacy address hierarchy model as
 // stored `kAutofillModelRules`. As a workaround for GCC we declare the
 // std::string constexpr first.
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 constexpr inline std::string kLegacyHierarchyCountryCodeString{"XX"};
 constexpr AddressCountryCode kLegacyHierarchyCountryCode =
     AddressCountryCode(kLegacyHierarchyCountryCodeString);
+#else
+constexpr std::string_view kLegacyHierarchyCountryCode = "XX";
+#endif
 
 // Creates an instance of the address hierarchy model corresponding to the
 // provided country. All the nodes have empty values, except for the country
index eb1e8c1..a0e45b5 100644 (file)
@@ -68,16 +68,28 @@ class AutofillProfile : public AutofillDataModel {
   // TODO(crbug.com/1464568): Make the country parameter non-optional.
   explicit AutofillProfile(
       AddressCountryCode country_code =
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
           i18n_model_definition::kLegacyHierarchyCountryCode);
+#else
+          AddressCountryCode(""));
+#endif
   explicit AutofillProfile(
       const std::string& guid,
       Source source = Source::kLocalOrSyncable,
       AddressCountryCode country_code =
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
           i18n_model_definition::kLegacyHierarchyCountryCode);
+#else
+          AddressCountryCode(""));
+#endif
   explicit AutofillProfile(
       Source source,
       AddressCountryCode country_code =
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
           i18n_model_definition::kLegacyHierarchyCountryCode);
+#else
+          AddressCountryCode(""));
+#endif
 
   // Server profile constructor. The type must be SERVER_PROFILE (this serves
   // to differentiate this constructor). |server_id| can be empty. If empty,
@@ -85,7 +97,11 @@ class AutofillProfile : public AutofillDataModel {
   AutofillProfile(RecordType type,
                   const std::string& server_id,
                   AddressCountryCode country_code =
+#if !defined(EWK_BRINGUP)  // Fixme : M120 Bringup
                       i18n_model_definition::kLegacyHierarchyCountryCode);
+#else
+                      AddressCountryCode(""));
+#endif
 
   AutofillProfile(const AutofillProfile& profile);
   ~AutofillProfile() override;
index a1a9c8f..f9d5c7c 100644 (file)
@@ -108,7 +108,11 @@ bool IbanSaveManager::ShouldOfferLocalSave(
     const Iban& iban_import_candidate) const {
   // Only offer to save new IBANs. Users can go to the payment methods settings
   // page to update existing IBANs if desired.
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+  return std::ranges::none_of(
+#else
   return base::ranges::none_of(
+#endif
       personal_data_manager_->GetLocalIbans(), [&](const auto& iban) {
         return iban->value() == iban_import_candidate.value();
       });
@@ -123,7 +127,11 @@ bool IbanSaveManager::ShouldOfferUploadSave(
 
   // Offer server save for this IBAN if it doesn't already match an existing
   // server IBAN.
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   return std::ranges::none_of(
+#else
+  return base::ranges::none_of(
+#endif
       personal_data_manager_->GetServerIbans(),
       [&iban_import_candidate](const auto& iban) {
         return iban->MatchesPrefixSuffixAndLength(iban_import_candidate);
index 1556b59..3b82c27 100644 (file)
@@ -1763,11 +1763,17 @@ std::unique_ptr<AutofillProfile> AutofillTable::GetAutofillProfile(
     }
 
     base::span<const uint8_t> observations_data = s.ColumnBlob(3);
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     field_type_values.emplace_back(
         type, s.ColumnString16(1), s.ColumnInt(2),
         std::vector<uint8_t>(observations_data.begin(),
                              observations_data.end()));
-
+#else
+    field_type_values.emplace_back(
+        FieldTypeData{type, s.ColumnString16(1), s.ColumnInt(2),
+                      std::vector<uint8_t>(observations_data.begin(),
+                                           observations_data.end())});
+#endif
     if (type == ADDRESS_HOME_COUNTRY) {
       country_code = base::UTF16ToUTF8(s.ColumnString16(1));
     }
index 754aec2..e41e8cc 100644 (file)
@@ -27,6 +27,11 @@ class COMPONENTS_DOWNLOAD_EXPORT DownloadSaveItemData
     // The referrer url for this file. (In case of a package download this is
     // the main page for the other resources.)
     GURL referrer_url;
+
+#if BUILDFLAG(IS_TIZEN)
+    ItemInfo(base::FilePath file_path, GURL url, GURL referrer_url)
+        : file_path(file_path), url(url), referrer_url(referrer_url) {}
+#endif
   };
 
   explicit DownloadSaveItemData(std::vector<ItemInfo>&& item_infos);
index 6fa2d75..0cbdc3d 100644 (file)
@@ -639,12 +639,13 @@ void PasswordManager::OnUserModifiedNonPasswordField(
     bool is_likely_otp) {
   // |driver| might be empty on iOS or in tests.
   int driver_id = driver ? driver->GetId() : 0;
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   possible_usernames_.Put(
       PossibleUsernameFieldIdentifier(driver_id, renderer_id),
       PossibleUsernameData(GetSignonRealm(driver->GetLastCommittedURL()),
                            renderer_id, value, base::Time::Now(), driver_id,
                            autocomplete_attribute_has_username, is_likely_otp));
-
+#endif
   if (base::FeatureList::IsEnabled(
           password_manager::features::kForgotPasswordFormSupport)) {
     FieldInfoManager* field_info_manager = client_->GetFieldInfoManager();
index 2853786..e7bd483 100644 (file)
@@ -2228,7 +2228,11 @@ AggregatedFrame SurfaceAggregator::Aggregate(
   root_surface_id_ = surface_id;
 
   // Start recording new stats for this aggregation.
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   stats_.emplace();
+#else
+  stats_.emplace(AggregateStatistics());
+#endif
 
   base::ElapsedTimer prewalk_timer;
   ResolvedFrameData* resolved_frame = GetResolvedFrame(surface_id);
index bec0d4e..81a6d79 100644 (file)
@@ -1571,7 +1571,8 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12(
 
       // Issue readbacks from the surfaces:
       for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) {
-        SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
+        SkISize size{};
+        size.set(plane_surfaces[i]->width(), plane_surfaces[i]->height());
         SkImageInfo dst_info = SkImageInfo::Make(
             size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType,
             kUnpremul_SkAlphaType);
index 01de995..2782f06 100644 (file)
@@ -2483,6 +2483,7 @@ source_set("browser") {
     deps += [
       "//components/crash/content/browser/error_reporting",
       "//components/services/font:lib",
+      "//content/common:mojo_bindings",
       "//content/common:sandbox_support_linux",
       "//third_party/blink/public/mojom:memory_usage_monitor_linux_mojo_bindings",
     ]
index 5bd4ca1..b22c500 100644 (file)
@@ -767,8 +767,14 @@ void SavePackage::Finish() {
   if (download_) {
     std::vector<download::DownloadSaveItemData::ItemInfo> files;
     for (auto& item : saved_success_items_) {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       files.emplace_back(item.second->full_path(), item.second->url(),
                          item.second->referrer().url);
+#else
+      files.emplace_back(download::DownloadSaveItemData::ItemInfo(
+          item.second->full_path(), item.second->url(),
+          item.second->referrer().url));
+#endif
     }
     download::DownloadSaveItemData::AttachItemData(download_, std::move(files));
   }
index b8f0b48..ed2e3f9 100644 (file)
@@ -19,8 +19,11 @@ using device::mojom::SensorType;
 namespace content {
 
 namespace {
-
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 constexpr std::vector<blink::mojom::PermissionsPolicyFeature>
+#else
+std::vector<blink::mojom::PermissionsPolicyFeature>
+#endif
 SensorTypeToPermissionsPolicyFeatures(SensorType type) {
   switch (type) {
     case SensorType::AMBIENT_LIGHT:
index 59c695e..d7d3035 100644 (file)
@@ -97,11 +97,19 @@ class CONTENT_EXPORT HeaderDirectFromSellerSignals {
   }
 
  private:
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   const absl::optional<std::string> seller_signals_;
 
   const absl::optional<std::string> auction_signals_;
 
   const base::flat_map<url::Origin, std::string> per_buyer_signals_;
+#else
+  absl::optional<std::string> seller_signals_;
+
+  absl::optional<std::string> auction_signals_;
+
+  base::flat_map<url::Origin, std::string> per_buyer_signals_;
+#endif
 };
 
 }  // namespace content
index 22a183f..a01ace3 100644 (file)
@@ -3002,10 +3002,17 @@ DoGetKAnonymityData(sql::Database& db,
 
   std::vector<StorageInterestGroup::KAnonymityData> k_anon_data;
   while (interest_group_kanon_query.Step()) {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     k_anon_data.emplace_back(
         /*key=*/interest_group_kanon_query.ColumnString(0),
         /*is_k_anonymous=*/interest_group_kanon_query.ColumnBool(1),
         /*last_updated=*/interest_group_kanon_query.ColumnTime(2));
+#else
+    k_anon_data.emplace_back(StorageInterestGroup::KAnonymityData(
+        interest_group_kanon_query.ColumnString(0),
+        interest_group_kanon_query.ColumnBool(1),
+        interest_group_kanon_query.ColumnTime(2)));
+#endif
   }
   if (!interest_group_kanon_query.Succeeded()) {
     return absl::nullopt;
index 0d65dfa..0db816b 100644 (file)
@@ -47,6 +47,15 @@ struct CONTENT_EXPORT StorageInterestGroup {
     bool is_k_anonymous;
     // The last time the unique user count was updated.
     base::Time last_updated;
+
+#if BUILDFLAG(IS_TIZEN)
+    KAnonymityData(std::string key,
+                   bool is_k_anonymous,
+                   base::Time last_updated)
+        : key(key),
+          is_k_anonymous(is_k_anonymous),
+          last_updated(last_updated) {}
+#endif
   };
 
   blink::InterestGroup interest_group;
index adba336..6fd2953 100644 (file)
@@ -8696,9 +8696,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeacon(
 
   for (const blink::FencedFrame::ReportingDestination& destination :
        destinations) {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     SendFencedFrameReportingBeaconInternal(
         DestinationEnumEvent(event_type, event_data), destination,
         /*from_renderer=*/true, attribution_reporting_runtime_features);
+#endif
   }
 }
 
@@ -8731,10 +8733,12 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeaconToCustomURL(
     return;
   }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   SendFencedFrameReportingBeaconInternal(
       DestinationURLEvent(destination_url),
       blink::FencedFrame::ReportingDestination::kBuyer,
       /*from_renderer=*/true, attribution_reporting_runtime_features);
+#endif
 }
 
 void RenderFrameHostImpl::MaybeSendFencedFrameAutomaticReportingBeacon(
@@ -8830,12 +8834,14 @@ void RenderFrameHostImpl::MaybeSendFencedFrameAutomaticReportingBeacon(
                     destination) != info->destinations.end()) {
         data = info->data;
       }
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       initiator_rfh->SendFencedFrameReportingBeaconInternal(
           DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType,
                                data),
           destination,
           /*from_renderer=*/false, attribution_reporting_features,
           navigation_request.GetNavigationId());
+#endif
     }
   } else {
     if (!info->destinations.empty()) {
@@ -8844,12 +8850,14 @@ void RenderFrameHostImpl::MaybeSendFencedFrameAutomaticReportingBeacon(
 
     for (blink::FencedFrame::ReportingDestination destination :
          info->destinations) {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       initiator_rfh->SendFencedFrameReportingBeaconInternal(
           DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType,
                                info->data),
           destination,
           /*from_renderer=*/false, info->attribution_reporting_runtime_features,
           navigation_request.GetNavigationId());
+#endif
     }
   }
 
index 09bc646..5f36cb7 100644 (file)
@@ -497,7 +497,7 @@ mojom("mojo_bindings") {
     "web_ui.mojom",
   ]
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [ "thread_type_switcher.mojom" ]
   }
 
index 6b960b9..1c37479 100644 (file)
@@ -147,7 +147,8 @@ void GpuChildThread::Init(const base::TimeTicks& process_start_time) {
 
   viz_main_.gpu_service()->set_start_time(process_start_time);
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || \
+    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
   SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated();
 #endif
 
index bfb0a24..5cdc79a 100644 (file)
@@ -328,7 +328,8 @@ int GpuMain(MainFunctionParams parameters) {
   // before it.
   InitializeSkia();
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
+    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
   // Thread type delegate of the process should be registered before
   // first thread type change in ChildProcess constructor.
   // It also needs to be registered before the process has multiple threads,
index 0a419be..19d268d 100644 (file)
@@ -127,10 +127,11 @@ class CONTENT_EXPORT WebUIBrowserInterfaceBrokerRegistry {
   //
   // TODO(crbug.com/1407936): Point to WebUIJsBridge documentation.
   template <typename ControllerType>
-  JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
+  typename JsBridgeTraits<ControllerType>::BinderInitializer&
+  ForWebUIWithJsBridge() {
     using Traits = JsBridgeTraits<ControllerType>;
-    using Interface = Traits::Interface;
-    using JsBridgeBinderInitializer = Traits::BinderInitializer;
+    using Interface = typename Traits::Interface;
+    using JsBridgeBinderInitializer = typename Traits::BinderInitializer;
 
     // WebUIController::GetType() requires an instantiated WebUIController
     // (because it's a virtual method and can't be static). Here we only have
index a77485d..c218487 100644 (file)
@@ -602,7 +602,8 @@ void RenderThreadImpl::Init() {
   }
 #endif
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || \
+    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
   SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated();
 #endif
 
@@ -649,7 +650,8 @@ void RenderThreadImpl::Init() {
   base::DiscardableMemoryAllocator::SetInstance(
       discardable_memory_allocator_.get());
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
+    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
   // The SandboxedProcessThreadTypeHandler isn't created in
   // render_thread_impl_browsertest.cc, nor in --single-process mode.
   if (SandboxedProcessThreadTypeHandler* sandboxed_process_thread_type_handler =
index 07fc80b..e6598a9 100644 (file)
@@ -244,7 +244,8 @@ std::string RendererBlinkPlatformImpl::GetNameForHistogram(const char* name) {
                             : std::string{name};
 }
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
+    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
 void RendererBlinkPlatformImpl::SetThreadType(base::PlatformThreadId thread_id,
                                               base::ThreadType thread_type) {
   // TODO: both of the usages of this method could just be switched to use
index 4c66ac5..12bc92b 100644 (file)
@@ -163,7 +163,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
       const blink::WebURL& document_url) override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
+    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
   void SetThreadType(base::PlatformThreadId thread_id,
                      base::ThreadType) override;
 #endif
index 9ba4905..09bfd9e 100644 (file)
@@ -265,7 +265,8 @@ int RendererMain(MainFunctionParams parameters) {
     }
 #endif
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
+    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
     // Thread type delegate of the process should be registered before
     // first thread type change in ChildProcess constructor.
     // It also needs to be registered before the process has multiple threads,
index e2867af..b52cd19 100644 (file)
@@ -1850,9 +1850,7 @@ test("content_browsertests") {
     deps += [ "//media/cdm:cdm_paths" ]
 
     # Runtime dependencies.
-    data_deps += [
-      "//media/cdm/library_cdm/clear_key_cdm",
-    ]
+    data_deps += [ "//media/cdm/library_cdm/clear_key_cdm" ]
   }
 
   if (enable_ppapi) {
@@ -2898,7 +2896,8 @@ test("content_unittests") {
     ]
   }
 
-  if (is_android || is_linux || is_chromeos || is_mac || is_win || is_fuchsia) {
+  if (is_android || is_linux || is_chromeos || is_mac || is_win || is_fuchsia ||
+      is_tizen) {
     data = [
       "$root_out_dir/content_shell.pak",
       "data/",
index 15d4f3d..1ee8077 100644 (file)
@@ -306,7 +306,8 @@ auto RunVideoCapture(
     mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) {
   auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>(
       std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault());
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || \
+    BUILDFLAG(IS_WIN)  // FIXME: m120 bringup
   if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
     mojo::PendingRemote<viz::mojom::Gpu> remote_gpu;
     content::UtilityThread::Get()->BindHostReceiver(
index 7f9e001..d934805 100644 (file)
@@ -252,7 +252,8 @@ int UtilityMain(MainFunctionParams parameters) {
     }
   }
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
+    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
   // Thread type delegate of the process should be registered before
   // first thread type change in ChildProcess constructor.
   // It also needs to be registered before the process has multiple threads,
index b707315..e025d54 100644 (file)
@@ -252,7 +252,8 @@ void UtilityThreadImpl::Init() {
 
   GetContentClient()->utility()->UtilityThreadStarted();
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || \
+    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
   SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated();
 #endif
 
index 97ebd0b..7b3c3c0 100644 (file)
@@ -338,7 +338,7 @@ class GPU_GLES2_EXPORT SharedImageBacking {
  private:
   class ScopedWriteUMA {
    public:
-    ScopedWriteUMA() = default;
+    ScopedWriteUMA() { content_consumed_ = false; }
 
     ScopedWriteUMA(const ScopedWriteUMA&) = delete;
     ScopedWriteUMA& operator=(const ScopedWriteUMA&) = delete;
index 042ca41..ef3d297 100644 (file)
@@ -5,7 +5,11 @@
 #ifndef GPU_VULKAN_SEMAPHORE_HANDLE_H_
 #define GPU_VULKAN_SEMAPHORE_HANDLE_H_
 
+#if defined(IS_TIZEN)
 #include <vulkan/vulkan_core.h>
+#else
+#include "third_party/swiftshader/include/vulkan/vulkan_core.h"
+#endif
 #include <utility>
 
 #include "base/component_export.h"
index caaf07a..8004aab 100644 (file)
@@ -5,7 +5,11 @@
 #ifndef GPU_VULKAN_VULKAN_IMPLEMENTATION_H_
 #define GPU_VULKAN_VULKAN_IMPLEMENTATION_H_
 
+#if defined(IS_TIZEN)
 #include <vulkan/vulkan_core.h>
+#else
+#include "third_party/swiftshader/include/vulkan/vulkan_core.h"
+#endif
 
 #include <memory>
 #include <vector>
index 835ecb6..2689d90 100644 (file)
@@ -316,7 +316,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate(
       is_capturing_(false),
       timeout_count_(0),
       rotation_(rotation) {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
 #endif  // BUILDFLAG(IS_LINUX)
 }
@@ -443,7 +443,7 @@ void V4L2CaptureDelegate::AllocateAndStart(
 
   client_->OnStarted();
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   if (use_gpu_buffer_) {
     v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>(
         std::move(gmb_support_test_));
@@ -1146,7 +1146,7 @@ void V4L2CaptureDelegate::DoCapture() {
       // workable on Linux.
 
       // See http://crbug.com/959919.
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       if (use_gpu_buffer_) {
         v4l2_gpu_helper_->OnIncomingCapturedData(
             client_.get(), buffer_tracker->start(),
@@ -1219,7 +1219,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureError error,
   client_->OnError(error, from_here, reason);
 }
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 gfx::ColorSpace V4L2CaptureDelegate::BuildColorSpaceFromv4l2() {
   v4l2_colorspace v4l2_primary = (v4l2_colorspace)video_fmt_.fmt.pix.colorspace;
   v4l2_quantization v4l2_range =
index 59d44c3..7fddf91 100644 (file)
@@ -167,7 +167,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
   // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270.
   int rotation_;
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   // Support GPU memory buffer.
   bool use_gpu_buffer_;
   std::unique_ptr<V4L2CaptureDelegateGpuHelper> v4l2_gpu_helper_;
index a6c9565..a19d54a 100644 (file)
@@ -42,7 +42,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker(
       return std::make_unique<GpuMemoryBufferTrackerCros>();
 #elif BUILDFLAG(IS_APPLE)
       return std::make_unique<GpuMemoryBufferTrackerApple>();
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       return std::make_unique<V4L2GpuMemoryBufferTracker>();
 #elif BUILDFLAG(IS_WIN)
       if (!dxgi_device_manager_) {
index 4c1a5bc..fdc106c 100644 (file)
@@ -227,8 +227,10 @@ void SourceBufferRange::ModifyFirstFrameForMpeghCodec() {
   // Creating new buffer based on changed data
   auto new_buffer = StreamParserBuffer::CopyFrom(
       &(new_data.front()), new_data.size(),
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup (Removed in Open Source)
       buffers_[next_buffer_index_]->side_data(),
       buffers_[next_buffer_index_]->side_data_size(),
+#endif
       buffers_[next_buffer_index_]->is_key_frame(),
       buffers_[next_buffer_index_]->type(),
       buffers_[next_buffer_index_]->track_id());
index 8d66503..fd2d44a 100644 (file)
@@ -316,6 +316,8 @@ class COMPONENT_EXPORT(MOJO_CPP_BINDINGS) MultiplexRouter
     InterfaceId interface_id = kInvalidInterfaceId;
     uint64_t request_id = 0;
     bool finished = false;
+
+    ExclusiveSyncWaitInfo() {}
   };
   absl::optional<ExclusiveSyncWaitInfo> exclusive_sync_wait_;
 
index 60b2023..aa57976 100644 (file)
@@ -134,7 +134,7 @@ int CertDatabase::AddUserCert(CERTCertificate* cert_obj) {
     LOG(ERROR) << "Couldn't import user certificate. " << PORT_GetError();
     return ERR_ADD_USER_CERT_FAILED;
   }
-  NotifyObserversCertDBChanged();
+  NotifyObserversClientCertStoreChanged();
   return OK;
 }
 
index 4a3f7ed..3c090af 100644 (file)
@@ -36,7 +36,9 @@ struct EVMetadata {
   const base::StringPiece policy_oids[kMaxOIDsPerCA];
 };
 
+#if !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
 #include "net/data/ssl/chrome_root_store/chrome-ev-roots-inc.cc"
+#endif
 
 #endif  // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
 }  // namespace
@@ -141,7 +143,9 @@ bool EVRootCAMetadata::RemoveEVCA(const SHA256HashValue& fingerprint) {
 
 EVRootCAMetadata::EVRootCAMetadata() {
 // Constructs the object from the raw metadata in kEvRootCaMetadata.
-#if defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
+// FIXME::M120 remove buildflag
+#if defined(PLATFORM_USES_CHROMIUM_EV_METADATA) && \
+    !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
   for (const auto& ev_root : kEvRootCaMetadata) {
     for (const auto& policy : ev_root.policy_oids) {
       if (policy.empty())
index 7fd5c46..96da8bd 100644 (file)
@@ -129,7 +129,7 @@ std::unique_ptr<SystemTrustStore> CreateSystemTrustStoreChromeForTesting(
 }
 #endif  // CHROME_ROOT_STORE_SUPPORTED
 
-#if BUILDFLAG(USE_NSS_CERTS)
+#if BUILDFLAG(USE_NSS_CERTS) && BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED)
 
 std::unique_ptr<SystemTrustStore> CreateSslSystemTrustStoreChromeRoot(
     std::unique_ptr<TrustStoreChrome> chrome_root) {
index 8841896..0f02c01 100644 (file)
 #include "net/cert/pki/parsed_certificate.h"
 #include "net/net_buildflags.h"
 
+#if BUILDFLAG(IS_TIZEN)
+#include "net/cert/internal/trust_store_chrome.h"
+#endif
+
 namespace net {
 
 class TrustStore;
index 48ec3a0..2db1b5d 100644 (file)
@@ -17,8 +17,6 @@ CertPrincipal::CertPrincipal(CertPrincipal&&) = default;
 
 CertPrincipal::~CertPrincipal() = default;
 
-bool CertPrincipal::operator==(const CertPrincipal& other) const = default;
-
 bool CertPrincipal::EqualsForTesting(const CertPrincipal& other) const {
   return *this == other;
 }
index d4bb5ea..a238697 100644 (file)
@@ -54,7 +54,7 @@ struct NET_EXPORT CertPrincipal {
  private:
   // Comparison operator is private and only defined for use by
   // EqualsForTesting, see comment there for more details.
-  bool operator==(const CertPrincipal& other) const;
+  bool operator==(const CertPrincipal& other) const = default;
 };
 
 }  // namespace net
index e35e231..8f852e4 100644 (file)
@@ -151,6 +151,12 @@ class NET_EXPORT HostResolverCache final {
 
     std::string domain_name;
     NetworkAnonymizationKey network_anonymization_key;
+#if BUILDFLAG(IS_TIZEN)
+    Key(std::string domain_name,
+        NetworkAnonymizationKey network_anonymization_key)
+        : domain_name(domain_name),
+          network_anonymization_key(network_anonymization_key) {}
+#endif
   };
 
   struct KeyRef {
index 8027cba..4a83531 100644 (file)
@@ -50,7 +50,8 @@ declare_args() {
 
   # Platforms for which certificate verification can only be performed using
   # the builtin cert verifier with the Chrome Root Store.
-  chrome_root_store_only = is_win || is_mac || is_linux || is_chromeos
+  chrome_root_store_only =
+      is_win || is_mac || is_linux || is_chromeos || is_tizen
 }
 
 assert(!chrome_root_store_optional || !chrome_root_store_only,
index 57fb4c8..ae89e7e 100644 (file)
@@ -39,7 +39,8 @@ std::string HttpAuthPreferences::AuthAndroidNegotiateAccountType() const {
 }
 #endif  // BUILDFLAG(IS_ANDROID)
 
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || \
+    (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN))  // FIXME: m120 bringup
 bool HttpAuthPreferences::AllowGssapiLibraryLoad() const {
   return allow_gssapi_library_load_;
 }
index f14d55e..cfb4b49 100644 (file)
@@ -50,7 +50,8 @@ class NET_EXPORT HttpAuthPreferences {
 #if BUILDFLAG(IS_ANDROID)
   virtual std::string AuthAndroidNegotiateAccountType() const;
 #endif
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || \
+    (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN))  // FIXME: m120 bringup
   virtual bool AllowGssapiLibraryLoad() const;
 #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
   virtual bool CanUseDefaultCredentials(
index cd84e46..8c259e8 100755 (executable)
@@ -2,9 +2,9 @@ Name: chromium-efl
 Summary: Chromium EFL
 # Version: {TPK_VERSION}.{INTERNAL_API_REVISION}.{CHROMIUM_MAJOR_VERSION}
 # The {INTERNAL_API_REVISION} is used for compatibility check with wrtjs.
-Version: 1.1.114
+Version: 1.1.120
 # Set by ./tizen_src/scripts/update_chromium_version.sh
-%define upstream_chromium_version 114.0.5735.31
+%define upstream_chromium_version 120.0.6099.5
 Release: 1
 # The 'Group' should be specified as one of the following valid group list.
 # https://wiki.tizen.org/wiki/Packaging/Guidelines#Group_Tag
index f111dac..f7458c3 100644 (file)
 #include "sandbox/linux/system_headers/linux_seccomp.h"
 #include "sandbox/linux/system_headers/linux_syscalls.h"
 
+#if BUILDFLAG(IS_TIZEN)
+#include <climits>
+#endif
+
 #if defined(MEMORY_SANITIZER)
 #include <sanitizer/msan_interface.h>
 #endif
index 9e70e09..28215a0 100644 (file)
@@ -470,7 +470,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
 NetworkContext::NetworkContextHttpAuthPreferences::
     ~NetworkContextHttpAuthPreferences() = default;
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
 bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad()
     const {
   if (network_service_) {
index 867fb18..fb76385 100644 (file)
@@ -678,7 +678,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    public:
     explicit NetworkContextHttpAuthPreferences(NetworkService* network_service);
     ~NetworkContextHttpAuthPreferences() override;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
     bool AllowGssapiLibraryLoad() const override;
 #endif  // BUILDFLAG(IS_LINUX)
    private:
index 10c97a0..cabbe28 100644 (file)
@@ -998,7 +998,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
   net::SetExplicitlyAllowedPorts(ports);
 }
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
 void NetworkService::SetGssapiLibraryLoadObserver(
     mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
         gssapi_library_load_observer) {
@@ -1080,7 +1080,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkContext* network_context) {
   );
 }
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
 void NetworkService::OnBeforeGssapiLibraryLoad() {
   if (gssapi_library_load_observer_.is_bound()) {
     gssapi_library_load_observer_->OnBeforeGssapiLibraryLoad();
index f185ff1..460c25a 100644 (file)
@@ -225,7 +225,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
       mojo::PendingReceiver<mojom::NetworkServiceTest> receiver) override;
   void SetFirstPartySets(net::GlobalFirstPartySets sets) override;
   void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
   void SetGssapiLibraryLoadObserver(
       mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
           gssapi_library_load_observer) override;
@@ -252,7 +252,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
   std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory(
       NetworkContext* network_context);
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
   // This is called just before a GSSAPI library may be loaded.
   void OnBeforeGssapiLibraryLoad();
 #endif  // BUILDFLAG(IS_LINUX)
@@ -494,7 +494,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
   // leaking stale listeners between tests.
   std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_;
 
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)  // FIXME: m120 bringup
   mojo::Remote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer_;
 #endif  // BUILDFLAG(IS_LINUX)
 
index 33de526..044e08b 100644 (file)
@@ -107,7 +107,8 @@ class VideoCaptureServiceImpl::GpuDependenciesContext {
       this};
 };
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || \
+    BUILDFLAG(IS_WIN)  // FIXME: m120 bringup
 // Intended usage of this class is to create viz::Gpu in utility process and
 // connect to viz::GpuClient of browser process, which will call to Gpu service.
 // Also, this class holds the viz::ContextProvider to listen and monitor Gpu
@@ -288,7 +289,8 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDependenciesContext() {
   if (!gpu_dependencies_context_)
     gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>();
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || \
+    BUILDFLAG(IS_WIN)  // FIXME: m120 bringup
   if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
     if (!viz_gpu_context_provider_) {
       viz_gpu_context_provider_ =
@@ -384,7 +386,8 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CHROME_LUID& luid) {
 }
 #endif
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || \
+    BUILDFLAG(IS_WIN)  // FIXME: m120 bringup
 void VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu) {
   viz_gpu_ = std::move(viz_gpu);
 }
index 884f7dd..2094406 100644 (file)
@@ -87,7 +87,8 @@ class VideoCaptureServiceImpl : public mojom::VideoCaptureService {
       factory_receivers_ash_;
 #endif
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || \
+    BUILDFLAG(IS_WIN)  // FIXME: m120 bringup
   class VizGpuContextProvider;
   std::unique_ptr<VizGpuContextProvider> viz_gpu_context_provider_;
   std::unique_ptr<viz::Gpu> viz_gpu_;
index b4f3b0d..4fff750 100644 (file)
@@ -220,7 +220,7 @@ class PairAsyncIterable {
  private:
   virtual IterationSource* CreateIterationSource(
       ScriptState* script_state,
-      IterationSource::Kind kind,
+      typename IterationSource::Kind kind,
       ExceptionState& exception_state) = 0;
 };
 
@@ -262,7 +262,7 @@ class ValueAsyncIterable {
  private:
   virtual IterationSource* CreateIterationSource(
       ScriptState* script_state,
-      IterationSource::Kind kind,
+      typename IterationSource::Kind kind,
       ExceptionState& exception_state) = 0;
 };
 
index 46bf126..a64ccb1 100644 (file)
@@ -212,7 +212,12 @@ class ComputedStyleBase : public GarbageCollected<ComputedStyleBase> {
     {% endfor %}
   }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
  private:
+#else
+ public:
+#endif
+
   {% for subgroup in computed_style.subgroups %}
   {{declare_field_group_class(subgroup)|indent(2)}}
 
index dd6ecf8..a736cae 100644 (file)
@@ -1689,7 +1689,9 @@ action_foreach("element_locator_test_protobuf") {
   python_path_root = "${root_out_dir}/pyproto"
   python_path_proto = "${python_path_root}/third_party/blink/renderer/core/lcp_critical_path_predictor"
 
-  mnemonic = "ELOC_PROTO"
+  if (!is_tizen) {
+    mnemonic = "ELOC_PROTO"
+  }
 
   source_dir = "lcp_critical_path_predictor/test_proto"
   sources = rebase_path([ "lcp_image_id.asciipb" ], "", source_dir)
index 83ef203..403fc3e 100644 (file)
@@ -172,9 +172,10 @@ class HTMLFastPathParser {
   using Span = base::span<const Char>;
   using USpan = base::span<const UChar>;
   // 32 matches that used by HTMLToken::Attribute.
-  typedef std::conditional<std::is_same_v<Char, UChar>,
-                           UCharLiteralBuffer<32>,
-                           LCharLiteralBuffer<32>>::type LiteralBufferType;
+  typedef
+      typename std::conditional<std::is_same_v<Char, UChar>,
+                                UCharLiteralBuffer<32>,
+                                LCharLiteralBuffer<32>>::type LiteralBufferType;
   typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
   static_assert(std::is_same_v<Char, UChar> || std::is_same_v<Char, LChar>);
 
index 35be24c..61620c5 100644 (file)
@@ -3445,7 +3445,11 @@ void GridLayoutAlgorithm::PlaceGridItems(
   DCHECK(out_row_break_between);
 
   const auto& container_space = ConstraintSpace();
-  const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
+
+  const auto& tree_root_data = sizing_tree.TreeRootData();
+  const auto& grid_items = tree_root_data.grid_items;
+  const auto& layout_data = tree_root_data.layout_data;
+  const auto& tree_size = tree_root_data.subtree_size;
 
   const auto* cached_layout_subtree = container_space.GetGridLayoutSubtree();
   const auto container_writing_direction =
@@ -3609,7 +3613,10 @@ void GridLayoutAlgorithm::PlaceGridItemsForFragmentation(
 
   // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
   const auto& constraint_space = ConstraintSpace();
-  const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
+  const auto& tree_root_data = sizing_tree.TreeRootData();
+  const auto& grid_items = tree_root_data.grid_items;
+  const auto& layout_data = tree_root_data.layout_data;
+  const auto& tree_size = tree_root_data.subtree_size;
 
   const auto* cached_layout_subtree = constraint_space.GetGridLayoutSubtree();
   const auto container_writing_direction =
index 15fea48..8e363df 100644 (file)
@@ -77,7 +77,12 @@ class CORE_EXPORT HistoryItem final : public GarbageCollected<HistoryItem> {
     DISALLOW_NEW();
 
    public:
-    ViewState() = default;
+    ViewState() {
+      visual_viewport_scroll_offset_ = ScrollOffset(0, 0);
+      scroll_offset_ = ScrollOffset(0, 0);
+      page_scale_factor_ = 0;
+      scroll_anchor_data_ = ScrollAnchorData();
+    }
     ViewState(const ViewState&) = default;
     ViewState& operator=(const ViewState&) = default;
 
index 71f1312..9f03ae9 100644 (file)
@@ -21,7 +21,7 @@ class FragmentDataIteratorBase {
 
  public:
   explicit FragmentDataIteratorBase(Head& head) : fragment_head_(head) {}
-  explicit FragmentDataIteratorBase(nullptr_t) {}
+  explicit FragmentDataIteratorBase(std::nullptr_t) {}
 
   Data* GetFragmentData() const {
     return !IsDone() ? &fragment_head_.at(idx_) : nullptr;
index 9adc6df..be94e55 100644 (file)
@@ -272,8 +272,8 @@ class CORE_EXPORT ObjectPaintPropertiesSparse : public ObjectPaintProperties {
       NodeList& nodes,
       NodeId node_id,
       const ParentType& parent,
-      NodeType::State&& state,
-      const NodeType::AnimationState& animation_state =
+      typename NodeType::State&& state,
+      const typename NodeType::AnimationState& animation_state =
           NodeType::AnimationState()) {
     // First, check if we need to add a new node.
     if (!nodes.HasField(node_id)) {
index fb635d9..a7b49f9 100644 (file)
@@ -90,12 +90,12 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
     case kGradient:
       GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
                                                        ImageDrawOptions());
-      flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
+      flags.setColor(SkColor4f{0.0f, 0.0f, 0.0f, global_alpha});
       break;
     case kImagePattern:
       GetCanvasPattern()->GetPattern()->ApplyToFlags(
           flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
-      flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
+      flags.setColor(SkColor4f{0.0f, 0.0f, 0.0f, global_alpha});
       break;
     default:
       NOTREACHED();
index e0ca997..56dc225 100644 (file)
@@ -101,7 +101,11 @@ void MediaControlTimelineElement::UpdateAria() {
 void MediaControlTimelineElement::SetPosition(double current_time,
                                               bool suppress_aria) {
   if (is_live_ && !live_anchor_time_ && current_time != 0) {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     live_anchor_time_.emplace();
+#else
+    live_anchor_time_.emplace(LiveAnchorTime());
+#endif
     live_anchor_time_->clock_time_ = base::TimeTicks::Now();
     live_anchor_time_->media_time_ = MediaElement().currentTime();
   }
index ac4cac0..d66438c 100644 (file)
@@ -781,6 +781,17 @@ class MODULES_EXPORT ServiceWorkerGlobalScope final
     String token;
     mojo::PendingRemote<network::mojom::blink::URLLoaderFactory>
         url_loader_factory;
+
+#if BUILDFLAG(IS_TIZEN)
+    RaceNetworkRequestInfo(
+        int fetch_event_id,
+        String token,
+        mojo::PendingRemote<network::mojom::blink::URLLoaderFactory>
+            url_loader_factory)
+        : fetch_event_id(fetch_event_id),
+          token(token),
+          url_loader_factory(std::move(url_loader_factory)) {}
+#endif
   };
   // TODO(crbug.com/918702) WTF::HashMap cannot use base::UnguessableToken as a
   // key. As a workaround uses WTF::String as a key instead.
index 01dac9c..65923e9 100644 (file)
@@ -62,6 +62,13 @@ class PLATFORM_EXPORT FontPalette : public RefCounted<FontPalette> {
   struct NonNormalizedPercentages {
     double start;
     double end;
+
+#if BUILDFLAG(IS_TIZEN)
+    NonNormalizedPercentages() : start(0), end(0) {}
+    NonNormalizedPercentages(double start, double end)
+        : start(start), end(end) {}
+#endif
+
     bool operator==(const NonNormalizedPercentages& other) const {
       return start == other.start && end == other.end;
       ;
index 1ce08e9..25ab98c 100644 (file)
@@ -31,8 +31,10 @@ Vector<FontPalette::FontPaletteOverride> PaletteInterpolation::MixColorRecords(
         color_interpolation_space, hue_interpolation_method, start_color,
         end_color, percentage, alpha_multiplier);
 
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     FontPalette::FontPaletteOverride result_color_record(i, result_color);
     result_color_records.push_back(result_color_record);
+#endif
   }
   return result_color_records;
 }
index c30b450..ac00c8f 100644 (file)
@@ -70,7 +70,11 @@ void GeometryMapperTransformCache::Update(
     to_2d_translation_root_ += translation;
 
     if (parent.plane_root_transform_) {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       plane_root_transform_.emplace();
+#else
+      plane_root_transform_.emplace(PlaneRootTransform());
+#endif
       plane_root_transform_->plane_root = parent.plane_root();
       plane_root_transform_->to_plane_root = parent.to_plane_root();
       plane_root_transform_->to_plane_root.Translate(translation.x(),
@@ -98,7 +102,11 @@ void GeometryMapperTransformCache::Update(
       // as the 2d translation root.
       plane_root_transform_ = absl::nullopt;
     } else {
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       plane_root_transform_.emplace();
+#else
+      plane_root_transform_.emplace(PlaneRootTransform());
+#endif
       plane_root_transform_->plane_root = parent.plane_root();
       plane_root_transform_->to_plane_root.MakeIdentity();
       parent.ApplyToPlaneRoot(plane_root_transform_->to_plane_root);
@@ -140,7 +148,11 @@ void GeometryMapperTransformCache::UpdateScreenTransform(
   parent_node->UpdateScreenTransform();
   const auto& parent = parent_node->GetTransformCache();
 
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   screen_transform_.emplace();
+#else
+  screen_transform_.emplace(ScreenTransform());
+#endif
   parent.ApplyToScreen(screen_transform_->to_screen);
   if (node.FlattensInheritedTransform())
     screen_transform_->to_screen.Flatten();
index 7b42646..54d1d55 100644 (file)
 
 #include "cpp/palettes/tones.h"
 
+#include "build/build_config.h"
 #include "cpp/cam/cam.h"
 #include "cpp/cam/hct.h"
 
+#if BUILDFLAG(IS_TIZEN)
+#include <cmath>
+#include <utility>
+#endif
+
 namespace material_color_utilities {
 
 TonalPalette::TonalPalette(Argb argb) : key_color_(0.0, 0.0, 0.0) {
@@ -55,7 +61,7 @@ Argb TonalPalette::get(double tone) const {
 Hct TonalPalette::createKeyColor(double hue, double chroma) {
   double start_tone = 50.0;
   Hct smallest_delta_hct(hue, chroma, start_tone);
-  double smallest_delta = abs(smallest_delta_hct.get_chroma() - chroma);
+  double smallest_delta = std::abs(smallest_delta_hct.get_chroma() - chroma);
   // Starting from T50, check T+/-delta to see if they match the requested
   // chroma.
   //
@@ -67,17 +73,17 @@ Hct TonalPalette::createKeyColor(double hue, double chroma) {
     // case where requested chroma is 16.51, and the closest chroma is 16.49.
     // Error is minimized, but when rounded and displayed, requested chroma
     // is 17, key color's chroma is 16.
-    if (round(chroma) == round(smallest_delta_hct.get_chroma())) {
+    if (std::round(chroma) == std::round(smallest_delta_hct.get_chroma())) {
       return smallest_delta_hct;
     }
     Hct hct_add(hue, chroma, start_tone + delta);
-    double hct_add_delta = abs(hct_add.get_chroma() - chroma);
+    double hct_add_delta = std::abs(hct_add.get_chroma() - chroma);
     if (hct_add_delta < smallest_delta) {
       smallest_delta = hct_add_delta;
       smallest_delta_hct = hct_add;
     }
     Hct hct_subtract(hue, chroma, start_tone - delta);
-    double hct_subtract_delta = abs(hct_subtract.get_chroma() - chroma);
+    double hct_subtract_delta = std::abs(hct_subtract.get_chroma() - chroma);
     if (hct_subtract_delta < smallest_delta) {
       smallest_delta = hct_subtract_delta;
       smallest_delta_hct = hct_subtract;
index 162dbc6..44b9d4b 100644 (file)
@@ -109,7 +109,7 @@ struct StoredSqlValue {
   // the destructors run correctly for non-trivial members of the
   // union.
   using Data =
-      std::variant<int64_t, double, OwnedString, OwnedBytes, nullptr_t>;
+      std::variant<int64_t, double, OwnedString, OwnedBytes, std::nullptr_t>;
 
   StoredSqlValue(SqlValue value) {
     switch (value.type) {
@@ -134,7 +134,7 @@ struct StoredSqlValue {
   }
 
   SqlValue AsSqlValue() {
-    if (std::holds_alternative<nullptr_t>(data)) {
+    if (std::holds_alternative<std::nullptr_t>(data)) {
       return SqlValue();
     } else if (std::holds_alternative<int64_t>(data)) {
       return SqlValue::Long(std::get<int64_t>(data));
index 425ca2a..b435c06 100644 (file)
@@ -121,6 +121,7 @@ class LossBasedBweV2 {
     double hold_duration_factor = 0.0;
     bool use_byte_loss_rate = false;
     TimeDelta padding_duration = TimeDelta::Zero();
+    Config() {}
   };
 
   struct Derivatives {
index 46cc294..d9d75df 100644 (file)
@@ -124,3 +124,10 @@ if (use_ozone) {
   #use_glib = true
   external_ozone_platforms = [ "efl" ]
 }
+
+if (ewk_bringup) {  #  FIXME: m120 bringup
+  tizen_autofill = false
+  if (tizen_product_tv) {
+    tizen_autofill_fw = false
+  }
+}
index e1357b1..bd928f3 100644 (file)
@@ -28,6 +28,12 @@ LocationProviderEfl::~LocationProviderEfl() {
   StopProvider();
 }
 
+void LocationProviderEfl::FillDiagnostics(
+    mojom::GeolocationDiagnostics& diagnostics) {
+  NOTIMPLEMENTED();
+  // FIXME: m120 bringup
+}
+
 // static
 void LocationProviderEfl::GeoPositionChangedCb(double latitude,
                                                double longitude,
index e8745c9..67c9e94 100644 (file)
@@ -21,6 +21,7 @@ class LocationProviderEfl : public LocationProvider {
   LocationProviderEfl();
   ~LocationProviderEfl() override;
 
+  void FillDiagnostics(mojom::GeolocationDiagnostics& diagnostics) override;
   void SetUpdateCallback(
       const LocationProviderUpdateCallback& callback) override;
   void StartProvider(bool high_accuracy) override;
index 1d2bd15..341d893 100644 (file)
@@ -656,6 +656,7 @@ void ContentBrowserClientEfl::ExposeInterfacesToRenderer(
 
 #if BUILDFLAG(IS_TIZEN_TV)
 base::OnceClosure ContentBrowserClientEfl::SelectClientCertificate(
+    BrowserContext* browser_context,
     WebContents* web_contents,
     net::SSLCertRequestInfo* cert_request_info,
     net::ClientCertIdentityList client_certs,
index 72dfffe..53d6635 100644 (file)
@@ -165,6 +165,7 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
   void AddDynamicCertificatePath(const std::string& host,
                                  const std::string& cert_path) override;
   base::OnceClosure SelectClientCertificate(
+      BrowserContext* browser_context,
       WebContents* web_contents,
       net::SSLCertRequestInfo* cert_request_info,
       net::ClientCertIdentityList client_certs,
index 7e097be..b091349 100644 (file)
@@ -375,7 +375,7 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD) Clipboard
   // programs.  Documentation on motivation for format ordering is also
   // available here:
   // https://docs.microsoft.com/en-us/windows/win32/dataxchg/clipboard-formats#multiple-clipboard-formats
-#if BUILDFLAG(IS_TIZEN)
+#if BUILDFLAG(IS_TIZEN) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   // On Tizen, it is required that HTML content should be written to clipboard
   // after type TEXT. So that when Copy-Paste operation is performed on markup
   // content, it should be rendered as-is.
index 785184d..64fd5ca 100644 (file)
@@ -917,7 +917,7 @@ InteractionSequence::StepBuilder InteractiveTestApi::PollState(
     StateIdentifier<PollingStateObserver<T>> id,
     C&& callback,
     base::TimeDelta polling_interval) {
-  using Cb = PollingStateObserver<T>::PollCallback;
+  using Cb = typename PollingStateObserver<T>::PollCallback;
   auto step = CheckElement(
       internal::kInteractiveTestPivotElementId,
       base::BindOnce(
@@ -941,7 +941,7 @@ InteractionSequence::StepBuilder InteractiveTestApi::PollElement(
     ui::ElementIdentifier element_identifier,
     C&& callback,
     base::TimeDelta polling_interval) {
-  using Cb = PollingElementStateObserver<T>::PollElementCallback;
+  using Cb = typename PollingElementStateObserver<T>::PollElementCallback;
   auto step = WithElement(
       internal::kInteractiveTestPivotElementId,
       base::BindOnce(
index 39a9c8a..d7750d6 100644 (file)
@@ -111,7 +111,7 @@ class InteractiveTestPrivate {
   // Adds `state_observer` and associates it with an element with identifier
   // `id` and context `context`. Must be unique in its context.
   // Returns true on success.
-  template <typename Observer, typename V = Observer::ValueType>
+  template <typename Observer, typename V = typename Observer::ValueType>
   bool AddStateObserver(ElementIdentifier id,
                         ElementContext context,
                         std::unique_ptr<Observer> state_observer);
@@ -601,7 +601,8 @@ struct MatcherTypeHelper<char16_t[N]> {
 // (e.g. `const char*`) as the corresponding `Matcher` should match a
 // `std::string` or `std::u16string`.
 template <typename T>
-using MatcherTypeFor = MatcherTypeHelper<std::remove_cvref_t<T>>::ActualType;
+using MatcherTypeFor =
+    typename MatcherTypeHelper<std::remove_cvref_t<T>>::ActualType;
 
 // Determines if `T` is a valid type to be used in a matcher. This precludes
 // string-like types (const char*, constexpr char16_t[], etc.) in favor of
index a807413..a7bf0e9 100644 (file)
@@ -203,8 +203,8 @@ std::unique_ptr<Palette> GeneratePalette(SkColor seed_color,
       break;
     }
     case SchemeVariant::kNeutral: {
-      const auto hues = std::to_array<double>({0, 260, 315, 360});
-      const auto chromas = std::to_array<double>({12.0, 12.0, 20.0, 12.0});
+      const auto hues = std::array<double, 4>({0, 260, 315, 360});
+      const auto chromas = std::array<double, 4>({12.0, 12.0, 20.0, 12.0});
       const base::flat_map<double, double> chroma_transforms =
           Zip(hues, chromas);
       config = {Transform(std::move(chroma_transforms)), Chroma(8.0),
index 8f60208..86915fc 100644 (file)
@@ -37,7 +37,11 @@ namespace ui {
 
 // When adding a new KeyboardCode, be sure to also update the associated mojom
 // file at ash/public/mojom/accelerator_keys.mojom.
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 enum KeyboardCode : unsigned char {
+#else
+enum KeyboardCode {
+#endif
   VKEY_CANCEL = 0x03,
   VKEY_BACK = 0x08,
   VKEY_TAB = 0x09,
index 14417fe..e4a357f 100644 (file)
@@ -20,7 +20,8 @@
 #endif
 
 #if defined(USE_EGL)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || \
+    (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN))  // FIXME: m120 bringup`
 #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC
 #include "ui/gl/gl_fence_android_native_fence_sync.h"
 #endif
index f9b3b29..fcc6b68 100644 (file)
@@ -834,7 +834,7 @@ ui::InteractionSequence::StepBuilder InteractiveViewsTestApi::PollView(
     ui::ElementIdentifier view_id,
     C&& callback,
     base::TimeDelta polling_interval) {
-  using Cb = PollingViewObserver<T, V>::PollViewCallback;
+  using Cb = typename PollingViewObserver<T, V>::PollViewCallback;
   Cb cb = ui::test::internal::MaybeBindRepeating(std::forward<C>(callback));
   auto step =
       WithElement(ui::test::internal::kInteractiveTestPivotElementId,
index def9caf..e849dd8 100644 (file)
 #define SEQ_CST_COMPARE_AND_SWAP_FIELD(p, offset, expected, value) \
   TaggedField<Object>::SeqCst_CompareAndSwap(p, offset, expected, value)
 
+#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
 #ifdef V8_DISABLE_WRITE_BARRIERS
 #define WRITE_BARRIER(object, offset, value)
 #else
                          value, UPDATE_WRITE_BARRIER);                      \
   } while (false)
 #endif
+#else
+#ifdef V8_DISABLE_WRITE_BARRIERS
+#define WRITE_BARRIER(object, offset, value)
+#else
+#define WRITE_BARRIER(object, offset, value)                        \
+  do {                                                              \
+    DCHECK_NOT_NULL(GetHeapFromWritableObject(object));             \
+    static_assert(kTaggedCanConvertToRawObjects);                   \
+    CombinedWriteBarrier(object, (object)->RawField(offset), value, \
+                         UPDATE_WRITE_BARRIER);                     \
+  } while (false)
+#endif
+
+#ifdef V8_DISABLE_WRITE_BARRIERS
+#define WEAK_WRITE_BARRIER(object, offset, value)
+#else
+#define WEAK_WRITE_BARRIER(object, offset, value)                            \
+  do {                                                                       \
+    DCHECK_NOT_NULL(GetHeapFromWritableObject(object));                      \
+    static_assert(kTaggedCanConvertToRawObjects);                            \
+    CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \
+                         UPDATE_WRITE_BARRIER);                              \
+  } while (false)
+#endif
+#endif
 
 #ifdef V8_DISABLE_WRITE_BARRIERS
 #define EPHEMERON_KEY_WRITE_BARRIER(object, offset, value)