[M130][EFL] Fix build errors for desktop profile 86/317486/12
authorv-saha <v.saha@samsung.com>
Thu, 2 Jan 2025 12:52:35 +0000 (18:22 +0530)
committerv-saha <v.saha@samsung.com>
Thu, 9 Jan 2025 13:33:49 +0000 (19:03 +0530)
This commit fixes gn related, compilation and linker errors
for desktop build.

Change-Id: Iebae23150a8f620a8fe1ac18c48a710e58bbabd1
Signed-off-by: Suhaspoornachandra <s.poornachan@samsung.com>
Signed-off-by: v-saha <v.saha@samsung.com>
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>
113 files changed:
base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
base/memory/weak_ptr.h
build/config/rust.gni
build_overrides/partition_alloc.gni
cc/layers/layer_impl.h
cc/layers/texture_layer_impl.h
cc/layers/video_layer_impl.cc
cc/layers/video_layer_impl.h
cc/trees/layer_tree_host_impl.cc
cc/trees/layer_tree_impl.cc
chrome/browser/ui/BUILD.gn
chrome/browser/ui/views/frame/browser_view.cc
chrome/browser/ui/views/frame/browser_view.h
chrome/browser/ui/window_sizer/window_sizer.cc
chrome/browser/webauthn/authenticator_request_dialog_model.cc
chrome/test/BUILD.gn
components/autofill/content/renderer/password_form_conversion_utils.cc
components/input/input_event_ack_state.h
components/password_manager/content/browser/content_password_manager_driver_factory.h
components/qr_code_generator/qr_code_generator.cc
components/viz/service/display/surface_aggregator.cc
content/browser/BUILD.gn
content/browser/renderer_host/render_widget_host_view_aura.h
content/public/browser/permission_controller_delegate.h
content/renderer/render_frame_impl.h
gin/public/isolate_holder.h
media/base/pipeline_impl.h
media/base/video_frame_layout.cc
media/base/video_types.h
media/parsers/h264_parser.cc
media/renderers/video_resource_updater.cc
media/renderers/video_resource_updater.h
net/base/upload_bytes_element_reader.cc
net/base/upload_bytes_element_reader.h
skia/BUILD.gn
third_party/blink/common/mime_util/mime_util.cc
third_party/blink/public/blink_resources.grd
third_party/blink/public/common/interest_group/auction_config.h
third_party/blink/public/common/mime_util/mime_util.h
third_party/blink/public/platform/modules/video_capture/web_video_capture_impl_manager.h
third_party/blink/renderer/bindings/generated_in_modules.gni
third_party/blink/renderer/bindings/idl_in_modules.gni
third_party/blink/renderer/core/frame/web_frame_widget_impl.cc
third_party/blink/renderer/modules/xr/BUILD.gn
third_party/blink/renderer/platform/fonts/web_font_typeface_factory.cc
third_party/blink/renderer/platform/image-decoders/BUILD.gn
third_party/blink/renderer/platform/image-decoders/image_decoder.cc
third_party/llvm-build/Release+Asserts/llvmobjdump_build_revision
third_party/node/node.py
third_party/openscreen/src/cast/streaming/remoting.proto
third_party/perfetto/include/perfetto/ext/base/uuid.h
third_party/perfetto/src/trace_processor/perfetto_sql/engine/created_function.cc
third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/callstacks/BUILD.gn
third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/linux/cpu/BUILD.gn
third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/viz/BUILD.gn [changed mode: 0755->0644]
third_party/rust/fend_core/v1/wrapper/BUILD.gn
tizen_src/.gn
tizen_src/build/gn_chromiumefl.sh
tizen_src/chromium_impl/base/message_loop/message_pump_ecore.cc
tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.cc
tizen_src/chromium_impl/content/browser/browser_efl.gni
tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc
tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc
tizen_src/chromium_impl/content/public/browser/certificates_utils.cc
tizen_src/chromium_impl/content/renderer/common_renderer_client.cc
tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.cc
tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.h
tizen_src/chromium_impl/ui/ozone/platform/efl/efl_event_handler.cc
tizen_src/chromium_impl/ui/ozone/platform/efl/efl_input_method_context.h
tizen_src/chromium_impl/ui/ozone/platform/efl/im_context_efl.cc
tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.cc
tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.h
tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.cc
tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h
tizen_src/ewk/efl_integration/browser/navigation_throttle_efl.cc
tizen_src/ewk/efl_integration/browser/network_service/proxying_url_loader_efl.cc
tizen_src/ewk/efl_integration/browser/network_service/proxying_url_loader_factory_efl.cc
tizen_src/ewk/efl_integration/browser/notification/notification_helper.cc
tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.cc
tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h
tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.h
tizen_src/ewk/efl_integration/browser/tizen_extensible_host.cc
tizen_src/ewk/efl_integration/browser/tizen_extensible_host.h
tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.cc
tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.h
tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc
tizen_src/ewk/efl_integration/browser/webdata/web_data_service.cc
tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc
tizen_src/ewk/efl_integration/common/content_client_efl.cc
tizen_src/ewk/efl_integration/common/content_client_efl.h
tizen_src/ewk/efl_integration/content_browser_client_efl.cc
tizen_src/ewk/efl_integration/content_browser_client_efl.h
tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
tizen_src/ewk/efl_integration/eweb_context.cc
tizen_src/ewk/efl_integration/eweb_view.cc
tizen_src/ewk/efl_integration/eweb_view.h
tizen_src/ewk/efl_integration/ewk_global_data.cc
tizen_src/ewk/efl_integration/permission_controller_delegate_efl.cc
tizen_src/ewk/efl_integration/permission_controller_delegate_efl.h
tizen_src/ewk/efl_integration/private/ewk_context_form_autofill_profile_private.cc
tizen_src/ewk/efl_integration/private/ewk_notification_private.cc
tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc
tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h
tizen_src/ewk/efl_integration/renderer/gin_native_bridge_dispatcher.h
tizen_src/ewk/efl_integration/renderer/plugins/hole_layer.cc
tizen_src/ewk/efl_integration/renderer/render_thread_observer_efl.cc
tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
tools/clang/scripts/update.py
ui/events/blink/web_input_event_traits.cc
v8/src/objects/object-macros.h

index 1c60c5f1f34e5cbc733d32fae018936492c78484..eedc7f19725c976848ef19971476620725ca18d5 100644 (file)
@@ -31,7 +31,7 @@
 // Annotate a function indicating it should not be inlined.
 // Use like:
 //   NOINLINE void DoStuff() { ... }
-#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline) && !BUILDFLAG(IS_TIZEN)
+#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline)
 #define PA_NOINLINE [[clang::noinline]]
 #elif PA_BUILDFLAG(PA_COMPILER_GCC) && PA_HAS_ATTRIBUTE(noinline)
 #define PA_NOINLINE __attribute__((noinline))
@@ -41,8 +41,7 @@
 #define PA_NOINLINE
 #endif
 
-#if defined(__clang__) && defined(NDEBUG) && \
-    PA_HAS_ATTRIBUTE(always_inline) && !BUILDFLAG(IS_TIZEN)
+#if defined(__clang__) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
 #define PA_ALWAYS_INLINE [[clang::always_inline]] inline
 #elif PA_BUILDFLAG(PA_COMPILER_GCC) && defined(NDEBUG) && \
     PA_HAS_ATTRIBUTE(always_inline)
@@ -61,8 +60,7 @@
 // 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) && \
-    !BUILDFLAG(IS_TIZEN)
+#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called)
 #define PA_NOT_TAIL_CALLED [[clang::not_tail_called]]
 #else
 #define PA_NOT_TAIL_CALLED
@@ -177,8 +175,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
 #endif  // defined(__clang_analyzer__)
 
 // Use nomerge attribute to disable optimization of merging multiple same calls.
-// FIXME: Enable for tizen if clang supports nomerge attribute.
-#if defined(__clang__) && PA_HAS_ATTRIBUTE(nomerge) && !BUILDFLAG(IS_TIZEN)
+#if defined(__clang__) && PA_HAS_ATTRIBUTE(nomerge)
 #define PA_NOMERGE [[clang::nomerge]]
 #else
 #define PA_NOMERGE
index 3dae41a6f0e7c691b201c42cc11a082640c4cb77..aff17b4c396f3e4b6c9cc59718ee8d1cc8a4b710 100644 (file)
@@ -99,18 +99,6 @@ class TaskQueueImpl;
 }
 
 template <typename T> class WeakPtr;
-// This class can only be instantiated if the constructor argument inherits
-// from SupportsWeakPtr<T> in exactly one way.
-template <typename T>
-struct ExtractSinglyInheritedBase;
-template <typename T>
-struct ExtractSinglyInheritedBase<SupportsWeakPtr<T>> {
-  using Base = T;
-  explicit ExtractSinglyInheritedBase(SupportsWeakPtr<T>*);
-};
-template <typename T>
-ExtractSinglyInheritedBase(SupportsWeakPtr<T>*)
--> ExtractSinglyInheritedBase<SupportsWeakPtr<T>>;
 
 namespace internal {
 // These classes are part of the WeakPtr implementation.
index 6305679d98a9563f46d72a387691d3981cc6667f..3dc36c14864ddda7cc757a388dfa10d33664eb16 100644 (file)
@@ -29,7 +29,7 @@ declare_args() {
   # The CXX tool is in //third_party/rust which is not shared with downstream
   # projects yet. So they need to copy the required dependencies and GN files
   # into their project to enable CXX there.
-  enable_rust_cxx = build_with_chromium
+  enable_rust_cxx = build_with_chromium && !use_efl
 
   # The chromium prelude crate provides the `chromium::import!` macro which
   # is needed to depend on first-party rust libraries. Third-party libraries
index c32552c411be8ea177f6bd5570ba6683b7c62808..cb881cc59ca11f09ec74f045ab1f6b74650b115f 100644 (file)
@@ -85,6 +85,11 @@ _is_partition_alloc_everywhere_platform =
 
 use_allocator_shim_default = true  # Updated below:
 
+# Enabling allocator shim causes crash on Chromium EFL.
+if (use_efl) {
+  use_allocator_shim_default = false
+}
+
 # Sanitizers replace the allocator, don't use our own.
 if (is_asan || is_hwasan || is_lsan || is_tsan || is_msan) {
   use_allocator_shim_default = false
@@ -103,7 +108,7 @@ if (is_fuchsia && _disable_partition_alloc_everywhere) {
 # Under Windows debug build, the allocator shim is not compatible with CRT.
 # NaCl in particular does seem to link some binaries statically against the
 # debug CRT with "is_nacl=false".
-if (is_win && is_debug && use_efl) {
+if (is_win && is_debug) {
   use_allocator_shim_default = false
 }
 
index 7202863cfbec82368f3fae1754e99f414daef1e4..eec715151140676971c6ce56399ef3669ae8b2ae 100644 (file)
@@ -482,7 +482,7 @@ class CC_EXPORT LayerImpl {
 
   ElementListType GetElementTypeForAnimation() const;
 
-#if BUILDFLAG(IS_EFL)
+#if BUILDFLAG(IS_EFL) && !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   virtual LayerType GetLayerType() const { return LAYER_TYPE_NORMAL; }
 #endif
 
index c1574e2adfe7ad7012e8553494c6153a5894db56..0edba6bb557b64fe28d524a8dbac0b7387dcaf00 100644 (file)
@@ -85,7 +85,7 @@ class CC_EXPORT TextureLayerImpl : public LayerImpl {
   static bool MayEvictResourceInBackground(
       viz::TransferableResource::ResourceSource source);
 
-#if BUILDFLAG(IS_EFL)
+#if BUILDFLAG(IS_EFL) && !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   LayerType GetLayerType() const override { return LAYER_TYPE_TEXTURE; }
 #endif
 
index 87ba89ef3dace0d4988c9324cf9939f32d62d423..50fbd4fb359ccdc977d6bff00a6c756bf3af8510 100644 (file)
@@ -189,9 +189,9 @@ bool VideoLayerImpl::WillDraw(DrawMode draw_mode,
         layer_tree_impl()->max_texture_size());
   }
 #if defined(TIZEN_TBM_SUPPORT)
-  updater_->ObtainFrameResources(frame_, resource_id_);
+  updater_->ObtainFrameResource(frame_, resource_id_);
 #else
-  updater_->ObtainFrameResources(frame_);
+  updater_->ObtainFrameResource(frame_);
 #endif
   return true;
 }
index e08dbfbd9dfd5ff2c05d707ad3400c1f40bac9e8..78e5a4caa627d1bdef1c5a5231cf74118c94c9e7 100644 (file)
@@ -70,7 +70,7 @@ class CC_EXPORT VideoLayerImpl : public LayerImpl {
     return video_transform_;
   }
 
-#if BUILDFLAG(IS_EFL)
+#if BUILDFLAG(IS_EFL) && !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   LayerType GetLayerType() const override { return LAYER_TYPE_VIDEO; }
 #endif
 
index 0155513902a820b8a6d93ce321ff77f6b11681a6..2ada0ad0698800b74022b0073382509a3e7355aa 100644 (file)
@@ -2712,10 +2712,12 @@ std::optional<SubmitInfo> LayerTreeHostImpl::DrawLayers(FrameData* frame) {
 
   base::TimeTicks submit_time = base::TimeTicks::Now();
   {
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
     TRACE_EVENT_WITH_FLOW0(
         "viz,benchmark", "MainFrame.SubmitCompositorFrame",
         TRACE_ID_GLOBAL(active_tree()->trace_id()),
         TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
+#endif
 #if BUILDFLAG(IS_EFL)
     if (active_tree_->non_empty_layout_frame()) {
       active_tree_->SetNonEmptyLayoutFrame(false);
@@ -2799,8 +2801,10 @@ std::optional<SubmitInfo> LayerTreeHostImpl::DrawLayers(FrameData* frame) {
 
 #if BUILDFLAG(IS_EFL)
 bool LayerTreeHostImpl::CanSkipFlush() const {
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   if (active_tree_->HasLayer(LAYER_TYPE_TEXTURE | LAYER_TYPE_VIDEO))
     return true;
+#endif
   return false;
 }
 #endif
index a5b4a9e5be474e2c980e991694147265a47d2914..f59df482110530c75b43623dc685da62064d23a8 100644 (file)
@@ -2065,7 +2065,7 @@ void LayerTreeImpl::DidAnimateScrollOffset() {
   host_impl_->DidAnimateScrollOffset();
 }
 
-#if BUILDFLAG(IS_EFL)
+#if BUILDFLAG(IS_EFL) && !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 bool LayerTreeImpl::HasLayer(LayerTypeMask layer_type_mask) const {
   for (auto& layer : layer_list_) {
     if (layer_type_mask & layer->GetLayerType())
index 157ce36214e0b13dadc945085ef419c5c6b8acfc..5e95470291ddb2f8cb2dea675a994309323925db 100644 (file)
@@ -1009,8 +1009,6 @@ static_library("ui") {
     sources += [
       "app_icon_loader.cc",
       "app_icon_loader.h",
-      "bluetooth/chrome_bluetooth_chooser_controller.cc",
-      "bluetooth/chrome_bluetooth_chooser_controller.h",
       "bookmarks/bookmark_bar.h",
       "bookmarks/bookmark_context_menu_controller.cc",
       "bookmarks/bookmark_context_menu_controller.h",
@@ -1466,8 +1464,6 @@ static_library("ui") {
       "tabs/tab_menu_model_factory.h",
       "tabs/tab_model.cc",
       "tabs/tab_model.h",
-      "tabs/tab_network_state.cc",
-      "tabs/tab_network_state.h",
       "tabs/tab_renderer_data.cc",
       "tabs/tab_renderer_data.h",
       "tabs/tab_strip_collection.cc",
@@ -3208,8 +3204,6 @@ static_library("ui") {
 
   if (is_win || is_mac || is_linux || is_chromeos || is_tizen) {
     sources += [
-      "frame/window_frame_util.cc",
-      "frame/window_frame_util.h",
       "incognito_clear_browsing_data_dialog_interface.h",
       "passwords/password_cross_domain_confirmation_popup_controller_impl.cc",
       "passwords/password_cross_domain_confirmation_popup_controller_impl.h",
@@ -5535,8 +5529,6 @@ static_library("ui") {
 
   if (use_aura) {
     sources += [
-      "aura/accessibility/automation_manager_aura.cc",
-      "aura/accessibility/automation_manager_aura.h",
       "overscroll_pref_manager.cc",
       "overscroll_pref_manager.h",
       "views/accelerator_utils_aura.cc",
index eca3ecaac400b6b5c06c5f0659b7d7346c72d882..0ba81dfef0f1d3193ba8486d2b0bd564ca006bad 100644 (file)
@@ -1011,6 +1011,7 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
   watermark_view_ = contents_container->AddChildView(
       std::make_unique<enterprise_watermark::WatermarkView>());
 
+#if BUILDFLAG(ENTERPRISE_WATERMARK)
   contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
       devtools_web_view_, contents_web_view_, watermark_view_));
 #else
index b87895e0f74794ff6b5f4eb4c3f66337e43e2fb3..0f18261c14f45cb05aa1be214bc43fba146d1d89 100644 (file)
@@ -1184,7 +1184,6 @@ class BrowserView : public BrowserWindow,
 
   // The view that overlays a watermark on the contents container.
   raw_ptr<enterprise_watermark::WatermarkView> watermark_view_ = nullptr;
-#endif
 
   // The view managing the devtools and contents positions.
   // Handled by ContentsLayoutManager.
index c911140cb0370b213dff43c47db43dd99152acd2..98d64c3754794e4aaa6c5c8dd4681d2066092162 100644 (file)
@@ -353,7 +353,9 @@ void WindowSizer::AdjustBoundsToBeVisibleOnDisplay(
   bounds->set_width(std::max(kMinVisibleWidth, bounds->width()));
 
   const gfx::Rect work_area = display.work_area();
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   CHECK(!work_area.IsEmpty(), base::NotFatalUntil::M131);
+#endif
   // Ensure that the title bar is not above the work area.
   if (bounds->y() < work_area.y())
     bounds->set_y(work_area.y());
index c4dbae4b5f053987a22bfe101abb7bbcdec74bd0..80669064fa764389e8b3abdc32a6670bd570c6bc 100644 (file)
@@ -301,5 +301,7 @@ AuthenticatorRequestDialogModel::Mechanism::CredentialInfo::CredentialInfo(
     const CredentialInfo&) = default;
 AuthenticatorRequestDialogModel::Mechanism::CredentialInfo::~CredentialInfo() =
     default;
+#if !BUILDFLAG(IS_EFL)
 bool AuthenticatorRequestDialogModel::Mechanism::CredentialInfo::operator==(
     const CredentialInfo&) const = default;
+#endif
index 61b8dceedb705d858aff2399150793a298d91027..160da883f3c353b88f0ec201308c8cb87e4609ec 100644 (file)
@@ -7000,7 +7000,6 @@ test("unit_tests") {
     "//third_party/metrics_proto",
     "//third_party/microsoft_webauthn",
     "//third_party/re2",
-    "//third_party/rust/fend_core/v1/wrapper:unit_tests",
     "//third_party/webrtc_overrides:webrtc_component",
     "//third_party/widevine/cdm:headers",
     "//third_party/zlib/google:compression_utils",
@@ -7028,6 +7027,10 @@ test("unit_tests") {
     "//base:path_service_unittest",
   ]
 
+  if (enable_rust) {
+    deps += [ "//third_party/rust/fend_core/v1/wrapper:unit_tests" ]
+  }
+
   if (is_chromeos) {
     sources += [ "../browser/device_reauth/chromeos/device_authenticator_chromeos_unittest.cc" ]
 
index 1b3b79a70886a43583c7b39ab7f74e9218b5e6e4..72d37576648287e3098b718b4bb80206840a35be 100644 (file)
@@ -146,7 +146,7 @@ std::optional<FormData> CreateFormDataFromWebForm(
   }
   form_data->set_is_gaia_with_skip_save_password_form(
       IsGaiaWithSkipSavePasswordForm(web_form) ||
-      IsGaiaReauthenticationForm(web_form);
+      IsGaiaReauthenticationForm(web_form));
 
 #if defined(TIZEN_AUTOFILL_FW)
   if (!HasPasswordContents(form_data->fields)) {
@@ -154,7 +154,7 @@ std::optional<FormData> CreateFormDataFromWebForm(
     return nullptr;
   }
 #endif
-      
+
   form_data->set_username_predictions(
       GetUsernamePredictions(*form_data, username_detector_cache));
   form_data->set_button_titles(
index 9153b3c32eb6ff31963806a216300a5dc65e6e6f..b6b6b0d434279dbd5754cabc5228d049b2487bef 100644 (file)
@@ -5,6 +5,10 @@
 #ifndef COMPONENTS_INPUT_INPUT_EVENT_ACK_STATE_H_
 #define COMPONENTS_INPUT_INPUT_EVENT_ACK_STATE_H_
 
+#if BUILDFLAG(IS_EFL)
+#include "third_party/blink/public/mojom/input/input_event_result.mojom-shared.h"
+#endif
+
 namespace input {
 
 const char* InputEventResultStateToString(
index 2606e94f226f12e6664c6bbb936684be9ef20d9b..c7684f66a0e679e6115ba9001ba283084d69538e 100644 (file)
@@ -50,6 +50,9 @@ class ContentPasswordManagerDriverFactory
     return GetDriverForFrame(render_frame_host);
   }
 
+  ContentPasswordManagerDriver* GetDriverForFrame(
+      content::RenderFrameHost* render_frame_host);
+
   // Requests all drivers to inform their renderers whether
   // chrome://password-manager-internals is available.
   void RequestSendLoggingAvailability();
@@ -62,9 +65,6 @@ class ContentPasswordManagerDriverFactory
   ContentPasswordManagerDriverFactory(content::WebContents* web_contents,
                                       PasswordManagerClient* client);
 
-  ContentPasswordManagerDriver* GetDriverForFrame(
-      content::RenderFrameHost* render_frame_host);
-
   // content::WebContentsObserver:
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
index 1685f34b3182dc6c8566290b0cc67c16268f3eb9..a9f6f200e38d3c7a45609b7f3f26d5906a52d12e 100644 (file)
@@ -8,9 +8,9 @@
 #include <vector>
 
 #include "base/check_op.h"
-#include "base/containers/span_rust.h"
 #include "base/numerics/safe_conversions.h"
 #if !BUILDFLAG(IS_EFL)
+#include "base/containers/span_rust.h"
 #include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h"
 #endif
 
index f43e356ae4a8305ce507af0914d725f11fb31c55..89334125c11abfd9060ce534b0d6bbecb153ce0f 100644 (file)
@@ -2118,12 +2118,13 @@ gfx::Rect SurfaceAggregator::PrewalkSurface(ResolvedFrameData& resolved_frame,
   if (root_resolved_pass.aggregation().will_draw)
     surface->OnWillBeDrawn();
 
+  const auto& frame_metadata = resolved_frame.GetMetadata();
 #if BUILDFLAG(IS_EFL)
-  if (frame.metadata.can_skip_flush)
+  if (frame_metadata.can_skip_flush) {
     result.can_skip_flush = true;
+  }
 #endif
 
-  const auto& frame_metadata = resolved_frame.GetMetadata();
   for (const SurfaceRange& surface_range : frame_metadata.referenced_surfaces) {
     damage_ranges_[surface_range.end().frame_sink_id()].push_back(
         surface_range);
index 4affee96a12b62f8bc4a6edc75d684458819bad9..92fc4a443c94bf477a00074eb2dd8c63db41fcf6 100644 (file)
@@ -2381,10 +2381,6 @@ source_set("browser") {
   ]
 
   if (use_efl) {
-    sources -= [
-      "renderer_host/ui_events_helper.cc",
-      "renderer_host/ui_events_helper.h",
-    ]
     deps += [ "//third_party/leveldatabase" ]
     deps += external_content_browser_efl_deps
   }
index e40f6bfb549189109e6652618fbaa58d7d6b1b57..90bd757bc593cb0a6a162f9fce32ac1477c584f1 100644 (file)
@@ -238,6 +238,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   void DidEdgeScrollBy(const gfx::Point& offset, bool handled) override ;
 #endif
 
+  bool ShouldInitiateStylusWriting() override;
   void OnStartStylusWriting() override;
   void OnEditElementFocusedForStylusWriting(
       const gfx::Rect& focused_edit_bounds,
index a6502732bb5c6a4703d47c3f24923a11156d1fc0..e961fff7c172ae8f40c48eba38bf2432a125f5a6 100644 (file)
@@ -33,6 +33,11 @@ struct PermissionRequestDescription;
 
 class CONTENT_EXPORT PermissionControllerDelegate {
  public:
+#if BUILDFLAG(IS_EFL)
+  // Identifier for an active subscription.
+  using SubscriptionId = base::IdType64<PermissionControllerDelegate>;
+#endif
+
   virtual ~PermissionControllerDelegate();
 
   // Requests multiple permissions on behalf of a frame identified by
index 5dcba83d7027063c6f4a4521e434956ca8d1bd1a..9865b0983545a96bb8de3da9b58c6021567eb08e 100644 (file)
@@ -668,8 +668,7 @@ class CONTENT_EXPORT RenderFrameImpl
   blink::WebEncryptedMediaClient* EncryptedMediaClient() override;
   blink::WebString UserAgentOverride() override;
   std::optional<blink::UserAgentMetadata> UserAgentMetadataOverride() override;
-  blink::mojom::RendererAudioInputStreamFactory* GetAudioInputStreamFactory()
-      override;
+  blink::mojom::RendererAudioInputStreamFactory* GetAudioInputStreamFactory();
   bool AllowContentInitiatedDataUrlNavigations(
       const blink::WebURL& url) override;
   void PostAccessibilityEvent(const ui::AXEvent& event) override;
index e67e86d01c858744eb6efab7c64f2e673407fa2e..79d33180e367bd459085733662407b6eae36159f 100644 (file)
@@ -91,12 +91,13 @@ class GIN_EXPORT IsolateHolder {
       v8::Isolate* isolate = nullptr);
 #else
       scoped_refptr<base::SingleThreadTaskRunner> low_priority_task_runner =
+#endif
 #endif
       scoped_refptr<base::SingleThreadTaskRunner> user_visible_task_runner =
           nullptr,
       scoped_refptr<base::SingleThreadTaskRunner> best_effort_task_runner =
           nullptr);
-#endif
+
   IsolateHolder(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       AccessMode access_mode,
@@ -110,12 +111,12 @@ class GIN_EXPORT IsolateHolder {
       v8::Isolate* isolate = nullptr);
 #else
       scoped_refptr<base::SingleThreadTaskRunner> low_priority_task_runner =
+#endif
 #endif
       scoped_refptr<base::SingleThreadTaskRunner> user_visible_task_runner =
           nullptr,
       scoped_refptr<base::SingleThreadTaskRunner> best_effort_task_runner =
           nullptr);
-#endif
 
   IsolateHolder(const IsolateHolder&) = delete;
   IsolateHolder& operator=(const IsolateHolder&) = delete;
index 5d6e10baf68e6ff0c70cce25d2e5f37403658f86..fc67a1e82fd2c9e934186c2ac3220851807dfb55 100644 (file)
@@ -148,6 +148,24 @@ class MEDIA_EXPORT PipelineImpl : public Pipeline {
   friend class MediaLog;
   class RendererWrapper;
 
+#if BUILDFLAG(IS_EFL)
+  // Pipeline states, as described above.
+  // TODO(alokp): Move this to RendererWrapper after removing the references
+  // from MediaLog.
+  enum State {
+    kCreated,
+    kStarting,
+    kSeeking,
+    kPlaying,
+    kStopping,
+    kStopped,
+    kSuspending,
+    kSuspended,
+    kResuming,
+  };
+  static const char* GetStateString(State state);
+#endif
+
   // Create a Renderer asynchronously. Must be called on the main task runner
   // and the callback will be called on the main task runner as well.
   void AsyncCreateRenderer(std::optional<RendererType> renderer_type,
index 2a3df1e415808e6d75f44f7f3e59744356807ebb..7e74e171a33ca923cbb815ae709ad9f7489b8bf4 100644 (file)
@@ -64,10 +64,6 @@ size_t VideoFrameLayout::NumPlanes(VideoPixelFormat format) {
     case PIXEL_FORMAT_NV12:
     case PIXEL_FORMAT_NV16:
     case PIXEL_FORMAT_NV21:
-    case PIXEL_FORMAT_P016LE:
-#if defined(TIZEN_TBM_SUPPORT)
-    case PIXEL_FORMAT_TBM_INTER_PROCESS_BUFFER:
-#endif
     case PIXEL_FORMAT_NV24:
     case PIXEL_FORMAT_P010LE:
     case PIXEL_FORMAT_P210LE:
index fa6316f072d134a22ed34c02c9801de717aaa1af..fcb086766b2ea6b8b5267edf4a14b2ac556067d0 100644 (file)
@@ -89,11 +89,6 @@ enum VideoPixelFormat {
   // 20bpp YUVA planar 1x1 Y, 2x2 interleaved UV, 1x1 A samples.
   PIXEL_FORMAT_NV12A = 39,
 
-
-#else
-  PIXEL_FORMAT_MAX =
-      PIXEL_FORMAT_NV12A,  // Must always be equal to largest entry logged.
-#endif  // BUILDFLAG(IS_TIZEN)
   // 16bpp YUV planar 1x1 Y, 2x1 interleaved UV, 8 bits per channel.
   PIXEL_FORMAT_NV16 = 40,
 
index d7a9458cdb6500670fb60e442ec2cdd1620ff663..08759cbbb198830085896dda2e5d3115574d40be 100644 (file)
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/hdr_metadata.h"
 
+#if BUILDFLAG(IS_EFL)
+#include "media/video/h26x_tools.h"
+#endif
+
 namespace media {
 
 bool H264SliceHeader::IsPSlice() const {
index a3b25cf7986e0245d8a371906e9e4c0704329274..290ac9d69288e77b82813e22afe6d09abf5d78e1 100644 (file)
@@ -782,7 +782,7 @@ VideoResourceUpdater::~VideoResourceUpdater() {
       this);
 }
 
-void VideoResourceUpdater::ObtainFrameResources(
+void VideoResourceUpdater::ObtainFrameResource(
     scoped_refptr<VideoFrame> video_frame,
     viz::ResourceId external_resource_id) {
 #if defined(TIZEN_TBM_SUPPORT)
index 2239efcb5c57f5a0f17c524acecd0f1e623e720c..15401caaca8257be701d0d35302b02d0047b4d4c 100644 (file)
@@ -106,10 +106,10 @@ class MEDIA_EXPORT VideoResourceUpdater
   // 2. AppendQuad(): Add DrawQuad to CompositorFrame for video.
   // 3. ReleaseFrameResource(): After the CompositorFrame has been submitted,
   //    remove imported resource from viz::ClientResourceProvider.
-  void ObtainFrameResources(
+  void ObtainFrameResource(
       scoped_refptr<VideoFrame> video_frame,
       viz::ResourceId resource_id = viz::kInvalidResourceId);
-  void ReleaseFrameResources();
+  void ReleaseFrameResource();
   // Appends a quad representing |frame| to |render_pass|.
   // At most one quad is expected to be appended, this is enforced by the users
   // of this class (e.g: VideoFrameSubmitter). Producing only one quad will
index 2e48048fe8a49c84838866cc1856b958934a0c67..ac97557ee33505dad31d763c098e0ff1b79148ac 100644 (file)
@@ -12,7 +12,12 @@ namespace net {
 
 UploadBytesElementReader::UploadBytesElementReader(
     base::span<const uint8_t> bytes)
+#if BUILDFLAG(IS_EFL)
+    : bytes_(bytes),
+      length_(bytes.size()) {}
+#else
     : bytes_(bytes) {}
+#endif
 
 UploadBytesElementReader::~UploadBytesElementReader() = default;
 
@@ -69,16 +74,30 @@ UploadOwnedBytesElementReader::CreateWithString(const std::string& string) {
 
 #if BUILDFLAG(IS_EFL)
 int64_t UploadBytesElementReader::GetSizeSync() const {
-  if (!bytes())
+#if BUILDFLAG(IS_EFL)
+  if (bytes_.empty()) {
+#else
+  if (!bytes()) {
+#endif
     return -1;
+  }
   return length();
 }
 
 bool UploadBytesElementReader::DumpReaderData(std::string& data) const {
-  if (!bytes())
+#if BUILDFLAG(IS_EFL)
+  if (bytes_.empty()) {
+#else
+  if (!bytes()) {
+#endif
     return false;
+  }
 
+#if BUILDFLAG(IS_EFL)
+  data = std::string(bytes_.begin(), bytes_.end());
+#else
   data = std::string(bytes(), bytes() + length());
+#endif
   return true;
 }
 #endif
index acd8437bc6c360af2f4f6f4a246cdcf29498be61..b3f91c41f29bad5f163b5c7e8c06eccccf0e0bd5 100644 (file)
@@ -39,12 +39,16 @@ class NET_EXPORT UploadBytesElementReader : public UploadElementReader {
            CompletionOnceCallback callback) override;
 
 #if BUILDFLAG(IS_EFL)
+  size_t length() const { return bytes_.size(); }
   int64_t GetSizeSync() const override;
   bool DumpReaderData(std::string& data) const override;
 #endif
 
  private:
   const base::span<const uint8_t> bytes_;
+#if BUILDFLAG(IS_EFL)
+  const size_t length_;
+#endif
   uint64_t offset_ = 0;
 };
 
index 8f8573fd21c6dff41dba52681cec705c4b742ae9..3a35e62bb72cfa85ce2477a58662569d3427ac05 100644 (file)
@@ -51,22 +51,24 @@ source_set("path_bridge") {
   sources = skia_fontations_path_bridge_sources
 }
 
-rust_static_library("bridge_rust_side") {
-  allow_unsafe = true
-  crate_root = skia_fontations_bridge_root
-  sources = skia_fontations_bridge_sources
-  cxx_bindings = skia_fontations_bridge_sources
-  deps = [
-    ":path_bridge",
-    "//third_party/rust/font_types/v0_7:lib",
-    "//third_party/rust/read_fonts/v0_22:lib",
-    "//third_party/rust/skrifa/v0_22:lib",
-  ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    ":skia_config",
-    "//build/config/compiler:no_chromium_code",
-  ]
+if (enable_rust_cxx) {
+  rust_static_library("bridge_rust_side") {
+    allow_unsafe = true
+    crate_root = skia_fontations_bridge_root
+    sources = skia_fontations_bridge_sources
+    cxx_bindings = skia_fontations_bridge_sources
+    deps = [
+      ":path_bridge",
+      "//third_party/rust/font_types/v0_7:lib",
+      "//third_party/rust/read_fonts/v0_22:lib",
+      "//third_party/rust/skrifa/v0_22:lib",
+    ]
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [
+      ":skia_config",
+      "//build/config/compiler:no_chromium_code",
+    ]
+  }
 }
 
 # External-facing config for dependent code.
@@ -422,15 +424,16 @@ component("skia") {
     # See SK_TYPEFACE_FACTORY_FREETYPE
     sources += skia_ports_freetype_sources
     sources += skia_ports_fontmgr_custom_sources
-    sources += skia_ports_typeface_fontations_sources
     sources += skia_ports_fontmgr_empty_sources
     public += skia_ports_fontmgr_empty_public
 
     # Fontations Rust/C++ bridge interfaces.
-    deps += [
-      ":bridge_rust_side",
-      ":path_bridge",
-    ]
+    deps += [ ":path_bridge" ]
+
+    if (enable_rust_cxx) {
+      sources += skia_ports_typeface_fontations_sources
+      deps += [ ":bridge_rust_side" ]
+    }
   }
 
   if (is_win) {
index 96f88ff2b0c164e6d09b6c584616a5a500965c31..ae1bf41474d2d805c8085f6002f182757aac506c 100644 (file)
@@ -117,16 +117,11 @@ constexpr auto kSupportedNonImageTypes =
 
 }  // namespace
 
-#if !defined(EWK_BRINGUP) // FIXME : M130 Bringup
-#if BUILDFLAG(IS_TIZEN_TV)
-  void RegisterJavascriptPluginMimeTypes(const std::string& mime_type);
-  bool IsSupportedJavascriptPluginMimeType(const std::string& mime_type) const;
-#endif
 
-private:
 #if BUILDFLAG(IS_TIZEN_TV)
-  MimeTypes javascript_plugin_types_;
-#endif
+void RegisterJavascriptPluginMimeTypes(const std::string_view mime_type);
+bool IsSupportedJavascriptPluginMimeType(
+    const std::string_view mime_type) const;
 #endif
 
 bool IsSupportedImageMimeType(std::string_view mime_type) {
@@ -185,7 +180,7 @@ bool IsSupportedMimeType(std::string_view mime_type) {
 
 #if BUILDFLAG(IS_TIZEN_TV)
 void MimeUtil::RegisterJavascriptPluginMimeTypes(
-    const std::string& mime_types) {
+    const std::string_view mime_types) {
   LOG(ERROR) << " Remove EWK_BRINGUP ";
 #if !defined(EWK_BRINGUP)
   std::stringstream stream(mime_types);
@@ -196,49 +191,27 @@ void MimeUtil::RegisterJavascriptPluginMimeTypes(
 }
 
 bool MimeUtil::IsSupportedJavascriptPluginMimeType(
-    const std::string& mime_type) const {
+    const std::string_view mime_type) const {
   return javascript_plugin_types_.find(base::ToLowerASCII(mime_type)) !=
          javascript_plugin_types_.end();
 }
-#endif
-
-// This variable is Leaky because it is accessed from WorkerPool threads.
-static base::LazyInstance<MimeUtil>::Leaky g_mime_util =
-    LAZY_INSTANCE_INITIALIZER;
-
-}  // namespace
-
-bool IsSupportedImageMimeType(const std::string& mime_type) {
-  return g_mime_util.Get().IsSupportedImageMimeType(mime_type);
-}
-
-bool IsSupportedNonImageMimeType(const std::string& mime_type) {
-  return g_mime_util.Get().IsSupportedNonImageMimeType(mime_type);
-}
-
-bool IsUnsupportedTextMimeType(const std::string& mime_type) {
-  return g_mime_util.Get().IsUnsupportedTextMimeType(mime_type);
-}
-
-bool IsSupportedJavascriptMimeType(const std::string& mime_type) {
-  return g_mime_util.Get().IsSupportedJavascriptMimeType(mime_type);
-}
 
-bool IsJSONMimeType(const std::string& mime_type) {
-  return g_mime_util.Get().IsJSONMimeType(mime_type);
+void RegisterJavascriptPluginMimeTypes(const std::string_view mime_type) {
+#if !defined(EWK_BRINGUP)  // Fixme : M130 Bringup
+  g_mime_util.Get().RegisterJavascriptPluginMimeTypes(mime_type);
+#endif
 }
 
-bool IsSupportedMimeType(const std::string& mime_type) {
-  return g_mime_util.Get().IsSupportedMimeType(mime_type);
+bool IsSupportedJavascriptPluginMimeType(const std::string_view mime_type) {
+#if !defined(EWK_BRINGUP)  // Fixme : M130 Bringup
+  return g_mime_util.Get().IsSupportedJavascriptPluginMimeType(mime_type);
+#endif
 }
 
+private:
 #if BUILDFLAG(IS_TIZEN_TV)
-void RegisterJavascriptPluginMimeTypes(const std::string& mime_type) {
-  g_mime_util.Get().RegisterJavascriptPluginMimeTypes(mime_type);
-}
+MimeTypes javascript_plugin_types_;
+#endif
 
-bool IsSupportedJavascriptPluginMimeType(const std::string& mime_type) {
-  return g_mime_util.Get().IsSupportedJavascriptPluginMimeType(mime_type);
-}
 #endif
 }  // namespace blink
index 338dc43641cb51f72a674021463390221e1603ad..16f085d888dd1eca3ab9d5177f6e4fc79d1867ba 100644 (file)
       <if expr="is_macosx">
         <include name="IDR_UASTYLE_THEME_MAC_CSS" file="../renderer/core/html/resources/mac.css" type="BINDATA" compress="gzip"/>
       </if>
-      <include name="IDR_UASTYLE_PERMISSION_ELEMENT_CSS" file="../renderer/core/html/resources/permission.css" flattenhtml="true" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS" file="../renderer/core/html/resources/input_multiple_fields.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_THEME_FORCED_COLORS_CSS" file="../renderer/core/html/resources/forced_colors.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_SELECTLIST_CSS" file="../renderer/core/html/resources/selectlist.css" flattenhtml="true" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_STYLABLE_SELECT_CSS" file="../renderer/core/html/resources/stylable_select.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_STYLABLE_SELECT_LINUX_CSS" file="../renderer/core/html/resources/stylable_select_linux.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_STYLABLE_SELECT_FORCED_COLORS_CSS" file="../renderer/core/html/resources/stylable_select_forced_colors.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_SVG_CSS" file="../renderer/core/css/svg.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_MARKER_CSS" file="../renderer/core/css/marker.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_MATHML_CSS" file="../renderer/core/css/mathml.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_FULLSCREEN_CSS" file="../renderer/core/css/fullscreen.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_TRANSITION_CSS" file="../renderer/core/css/transition.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_UASTYLE_TRANSITION_ANIMATIONS_CSS" file="../renderer/core/css/transition_animations.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_DOCUMENTXMLTREEVIEWER_CSS" file="../renderer/core/xml/DocumentXMLTreeViewer.css" type="BINDATA" compress="brotli"/>
-      <include name="IDR_DOCUMENTXMLTREEVIEWER_JS" file="../renderer/core/xml/DocumentXMLTreeViewer.js" type="BINDATA" compress="brotli"/>
-      <include name="IDR_VALIDATION_BUBBLE_ICON" file="../renderer/core/html/forms/resources/input_alert.svg" type="BINDATA" compress="brotli"/>
-      <include name="IDR_VALIDATION_BUBBLE_CSS" file="../renderer/core/html/forms/resources/validation_bubble.css" type="BINDATA" compress="brotli"/>
+      <include name="IDR_UASTYLE_PERMISSION_ELEMENT_CSS" file="../renderer/core/html/resources/permission.css" flattenhtml="true" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS" file="../renderer/core/html/resources/input_multiple_fields.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_THEME_FORCED_COLORS_CSS" file="../renderer/core/html/resources/forced_colors.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_SELECTLIST_CSS" file="../renderer/core/html/resources/selectlist.css" flattenhtml="true" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_STYLABLE_SELECT_CSS" file="../renderer/core/html/resources/stylable_select.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_STYLABLE_SELECT_LINUX_CSS" file="../renderer/core/html/resources/stylable_select_linux.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_STYLABLE_SELECT_FORCED_COLORS_CSS" file="../renderer/core/html/resources/stylable_select_forced_colors.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_SVG_CSS" file="../renderer/core/css/svg.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_MARKER_CSS" file="../renderer/core/css/marker.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_MATHML_CSS" file="../renderer/core/css/mathml.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_FULLSCREEN_CSS" file="../renderer/core/css/fullscreen.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_TRANSITION_CSS" file="../renderer/core/css/transition.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_UASTYLE_TRANSITION_ANIMATIONS_CSS" file="../renderer/core/css/transition_animations.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_DOCUMENTXMLTREEVIEWER_CSS" file="../renderer/core/xml/DocumentXMLTreeViewer.css" type="BINDATA" compress="gzip"/>
+      <include name="IDR_DOCUMENTXMLTREEVIEWER_JS" file="../renderer/core/xml/DocumentXMLTreeViewer.js" type="BINDATA" compress="gzip"/>
+      <include name="IDR_VALIDATION_BUBBLE_ICON" file="../renderer/core/html/forms/resources/input_alert.svg" type="BINDATA" compress="gzip"/>
+      <include name="IDR_VALIDATION_BUBBLE_CSS" file="../renderer/core/html/forms/resources/validation_bubble.css" type="BINDATA" compress="gzip"/>
       <if expr="not is_android">
         <include name="IDR_PICKER_COMMON_JS" file="../renderer/core/html/forms/resources/picker_common.js" type="BINDATA" compress="gzip"/>
         <include name="IDR_PICKER_COMMON_CSS" file="../renderer/core/html/forms/resources/picker_common.css" type="BINDATA" compress="gzip"/>
index a6139166f5b80cfcdcd6e5c9c80ca557bc2ff0f5..fffbbe787e03e1a95eb4d4ec68a79cc76276be66 100644 (file)
@@ -468,7 +468,7 @@ struct BLINK_COMMON_EXPORT AuctionConfig {
   // Origin for the Coordinator to be used for Private Aggregation.
   std::optional<url::Origin> aggregation_coordinator_origin;
 
-  static_assert(__LINE__ == 470, R"(
+  static_assert(__LINE__ == 471, R"(
 If modifying AuctionConfig fields, please make sure to also modify:
 
 * third_party/blink/public/mojom/interest_group/interest_group_types.mojom
index 9eea7dc6ac86213a07c1ca41eb78ff4824a64488..d56c2d1226e6fc75a974115c7c94aac069704f1e 100644 (file)
@@ -7,6 +7,7 @@
 
 #include <string_view>
 
+#include "build/build_config.h"
 #include "third_party/blink/public/common/common_export.h"
 
 namespace blink {
@@ -26,9 +27,10 @@ bool BLINK_COMMON_EXPORT IsSVGMimeType(std::string_view mime_type);
 // Convenience function.
 
 #if BUILDFLAG(IS_TIZEN_TV)
-void BLINK_COMMON_EXPORT RegisterJavascriptPluginMimeTypes(const std::string&);
+void BLINK_COMMON_EXPORT
+RegisterJavascriptPluginMimeTypes(const std::string_view);
 bool BLINK_COMMON_EXPORT
-IsSupportedJavascriptPluginMimeType(const std::string&);
+IsSupportedJavascriptPluginMimeType(const std::string_view);
 #endif
 bool BLINK_COMMON_EXPORT IsSupportedMimeType(std::string_view mime_type);
 
index 94a77d5102db44632cec4821899c2c7748065697..43b31ddeaddaf6bb9870e4b31693dcaf95ac9ca0 100644 (file)
@@ -55,13 +55,12 @@ class BLINK_PLATFORM_EXPORT WebVideoCaptureImplManager {
   // resources.
   base::OnceClosure UseDevice(
       const media::VideoCaptureSessionId& id,
-      BrowserInterfaceBrokerProxy* browser_interface_broker
+      const BrowserInterfaceBrokerProxy& browser_interface_broker
 #if defined(TIZEN_MULTIMEDIA)
       ,
       bool lazy_start = false
 #endif
   );
-      const BrowserInterfaceBrokerProxy& browser_interface_broker);
 
   // Start receiving video frames for the given session ID.
   //
index 6e15358520a103e90b7e5a09c3fbd0a4d210d471..38090961ab13a8da6dd324bd90e86fc7b8861dbc 100644 (file)
@@ -79,6 +79,8 @@ generated_callback_function_sources_in_modules = [
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_video_frame_request_callback.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_webcodecs_error_callback.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_webcodecs_error_callback.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_frame_request_callback.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_frame_request_callback.h",
 ]
 
 if (enable_compute_pressure) {
@@ -1820,6 +1822,44 @@ generated_enumeration_sources_in_modules = [
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_wgsl_feature_name.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_write_command_type.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_write_command_type.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_data_format.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_data_format.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_usage.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_usage.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_dom_overlay_type.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_dom_overlay_type.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_environment_blend_mode.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_environment_blend_mode.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_eye.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_eye.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hand_joint.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hand_joint.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_handedness.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_handedness.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hit_test_trackable_type.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hit_test_trackable_type.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_image_tracking_score.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_image_tracking_score.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_image_tracking_state.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_image_tracking_state.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_interaction_mode.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_interaction_mode.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_layer_layout.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_layer_layout.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_plane_orientation.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_plane_orientation.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reference_space_type.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reference_space_type.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reflection_format.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reflection_format.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session_mode.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session_mode.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_target_ray_mode.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_target_ray_mode.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_texture_type.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_texture_type.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_visibility_state.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_visibility_state.h",
 ]
 
 if (enable_compute_pressure) {
@@ -2286,6 +2326,8 @@ generated_interface_sources_in_modules = [
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_hid_input_report_event.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_html_canvas_element.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_html_canvas_element.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_html_element.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_html_element.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_html_iframe_element.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_html_iframe_element.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_html_input_element.cc",
@@ -2364,6 +2406,8 @@ generated_interface_sources_in_modules = [
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_lock_screen_data.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_magnetometer.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_magnetometer.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_mathml_element.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_mathml_element.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_media_capabilities.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_media_capabilities.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_media_device_info.cc",
@@ -2760,6 +2804,8 @@ generated_interface_sources_in_modules = [
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sub_apps.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_subtle_crypto.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_subtle_crypto.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_svg_element.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_svg_element.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_event.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_event.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_manager.cc",
@@ -3099,6 +3145,12 @@ generated_sync_iterator_sources_in_modules = [
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_rtc_stats_report.h",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_wgsl_language_features.cc",
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_wgsl_language_features.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_anchor_set.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_anchor_set.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_hand.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_hand.h",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_plane_set.cc",
+  "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_plane_set.h",
 ]
 
 generated_typedef_sources_in_modules = [
@@ -3198,186 +3250,6 @@ generated_union_sources_in_modules = [
   "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_union_workletanimationeffect_workletgroupeffect.h",
 ]
 
-if (!use_efl) {
-  generated_callback_function_sources_in_modules += [
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_frame_request_callback.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_frame_request_callback.h",
-  ]
-
-  generated_dictionary_sources_in_modules += [
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_state_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_state_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_dom_overlay_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_dom_overlay_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hit_test_options_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hit_test_options_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_source_event_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_source_event_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_sources_change_event_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_sources_change_event_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_light_probe_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_light_probe_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_ray_direction_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_ray_direction_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reference_space_event_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reference_space_event_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_render_state_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_render_state_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session_event_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session_event_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_tracked_image_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_tracked_image_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_transient_input_hit_test_options_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_transient_input_hit_test_options_init.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer_init.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer_init.h",
-  ]
-
-  generated_enumeration_sources_in_modules += [
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_data_format.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_data_format.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_usage.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_usage.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_dom_overlay_type.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_dom_overlay_type.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_environment_blend_mode.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_environment_blend_mode.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_eye.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_eye.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hand_joint.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hand_joint.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_handedness.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_handedness.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hit_test_trackable_type.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hit_test_trackable_type.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_image_tracking_score.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_image_tracking_score.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_image_tracking_state.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_image_tracking_state.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_interaction_mode.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_interaction_mode.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_plane_orientation.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_plane_orientation.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reference_space_type.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reference_space_type.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reflection_format.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reflection_format.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session_mode.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session_mode.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_target_ray_mode.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_target_ray_mode.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_visibility_state.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_visibility_state.h",
-  ]
-
-  generated_interface_sources_in_modules += [
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_html_element.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_html_element.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_mathml_element.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_mathml_element.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_svg_element.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_svg_element.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_anchor.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_anchor.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_anchor_set.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_anchor_set.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_bounded_reference_space.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_bounded_reference_space.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_camera.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_camera.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_cpu_depth_information.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_cpu_depth_information.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_information.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_depth_information.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_dom_overlay_state.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_dom_overlay_state.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_frame.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_frame.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hand.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hand.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hit_test_result.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hit_test_result.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hit_test_source.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_hit_test_source.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_image_tracking_result.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_image_tracking_result.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_source.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_source.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_source_array.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_source_array.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_source_event.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_source_event.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_sources_change_event.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_input_sources_change_event.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_joint_pose.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_joint_pose.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_joint_space.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_joint_space.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_layer.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_layer.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_light_estimate.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_light_estimate.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_light_probe.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_light_probe.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_plane.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_plane.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_plane_set.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_plane_set.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_pose.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_pose.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_ray.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_ray.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reference_space.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reference_space.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reference_space_event.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_reference_space_event.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_render_state.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_render_state.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_rigid_transform.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_rigid_transform.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session_event.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_session_event.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_space.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_space.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_system.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_system.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_transient_input_hit_test_result.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_transient_input_hit_test_result.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_transient_input_hit_test_source.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_transient_input_hit_test_source.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_view.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_view.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_viewer_pose.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_viewer_pose.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_viewport.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_viewport.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_binding.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_binding.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_depth_information.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_depth_information.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.h",
-  ]
-
-  generated_sync_iterator_sources_in_modules += [
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_anchor_set.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_anchor_set.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_hand.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_hand.h",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_plane_set.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_sync_iterator_xr_plane_set.h",
-  ]
-
-  generated_union_sources_in_modules += [
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_union_webgl2renderingcontext_webglrenderingcontext.cc",
-    "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_union_webgl2renderingcontext_webglrenderingcontext.h",
-  ]
-}
-
 # Direct Sockets
 # This uses target_os rather than current_os (which is what is_android is set
 # from) for the case of generating the v8 context snapshot for android. When
index 4abaf32dad909e158469a4a2352807c6be725e35..b4548d4bd436f736e29c0bf0c539bf786255acf2 100644 (file)
@@ -1269,80 +1269,6 @@ static_idl_files_in_modules = [
   "//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl",
 ]
 
-if (!use_efl) {
-  static_idl_files_in_modules += get_path_info(
-          [
-            "//third_party/blink/renderer/modules/xr/document_xr.idl",
-            "//third_party/blink/renderer/modules/xr/html_element_xr.idl",
-            "//third_party/blink/renderer/modules/xr/mathml_element_xr.idl",
-            "//third_party/blink/renderer/modules/xr/navigator_xr.idl",
-            "//third_party/blink/renderer/modules/xr/svg_element_xr.idl",
-            "//third_party/blink/renderer/modules/xr/window_xr.idl",
-            "//third_party/blink/renderer/modules/xr/xr_anchor.idl",
-            "//third_party/blink/renderer/modules/xr/xr_anchor_set.idl",
-            "//third_party/blink/renderer/modules/xr/xr_bounded_reference_space.idl",
-            "//third_party/blink/renderer/modules/xr/xr_camera.idl",
-            "//third_party/blink/renderer/modules/xr/xr_composition_layer.idl",
-            "//third_party/blink/renderer/modules/xr/xr_cpu_depth_information.idl",
-            "//third_party/blink/renderer/modules/xr/xr_depth_information.idl",
-            "//third_party/blink/renderer/modules/xr/xr_depth_state_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_dom_overlay_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_dom_overlay_state.idl",
-            "//third_party/blink/renderer/modules/xr/xr_frame.idl",
-            "//third_party/blink/renderer/modules/xr/xr_frame_request_callback.idl",
-            "//third_party/blink/renderer/modules/xr/xr_hand.idl",
-            "//third_party/blink/renderer/modules/xr/xr_hit_test_options_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_hit_test_result.idl",
-            "//third_party/blink/renderer/modules/xr/xr_hit_test_source.idl",
-            "//third_party/blink/renderer/modules/xr/xr_image_tracking_result.idl",
-            "//third_party/blink/renderer/modules/xr/xr_input_source.idl",
-            "//third_party/blink/renderer/modules/xr/xr_input_source_array.idl",
-            "//third_party/blink/renderer/modules/xr/xr_input_source_event.idl",
-            "//third_party/blink/renderer/modules/xr/xr_input_source_event_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_input_sources_change_event.idl",
-            "//third_party/blink/renderer/modules/xr/xr_input_sources_change_event_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_joint_pose.idl",
-            "//third_party/blink/renderer/modules/xr/xr_joint_space.idl",
-            "//third_party/blink/renderer/modules/xr/xr_layer.idl",
-            "//third_party/blink/renderer/modules/xr/xr_light_estimate.idl",
-            "//third_party/blink/renderer/modules/xr/xr_light_probe.idl",
-            "//third_party/blink/renderer/modules/xr/xr_light_probe_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_plane.idl",
-            "//third_party/blink/renderer/modules/xr/xr_plane_set.idl",
-            "//third_party/blink/renderer/modules/xr/xr_pose.idl",
-            "//third_party/blink/renderer/modules/xr/xr_projection_layer.idl",
-            "//third_party/blink/renderer/modules/xr/xr_ray.idl",
-            "//third_party/blink/renderer/modules/xr/xr_ray_direction_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_reference_space.idl",
-            "//third_party/blink/renderer/modules/xr/xr_reference_space_event.idl",
-            "//third_party/blink/renderer/modules/xr/xr_reference_space_event_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_render_state.idl",
-            "//third_party/blink/renderer/modules/xr/xr_render_state_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_rigid_transform.idl",
-            "//third_party/blink/renderer/modules/xr/xr_session.idl",
-            "//third_party/blink/renderer/modules/xr/xr_session_event.idl",
-            "//third_party/blink/renderer/modules/xr/xr_session_event_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_session_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_space.idl",
-            "//third_party/blink/renderer/modules/xr/xr_sub_image.idl",
-            "//third_party/blink/renderer/modules/xr/xr_system.idl",
-            "//third_party/blink/renderer/modules/xr/xr_tracked_image_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_options_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_result.idl",
-            "//third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_source.idl",
-            "//third_party/blink/renderer/modules/xr/xr_view.idl",
-            "//third_party/blink/renderer/modules/xr/xr_viewer_pose.idl",
-            "//third_party/blink/renderer/modules/xr/xr_viewport.idl",
-            "//third_party/blink/renderer/modules/xr/xr_webgl_binding.idl",
-            "//third_party/blink/renderer/modules/xr/xr_webgl_context.idl",
-            "//third_party/blink/renderer/modules/xr/xr_webgl_depth_information.idl",
-            "//third_party/blink/renderer/modules/xr/xr_webgl_layer.idl",
-            "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl",
-            "//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl",
-          ],
-          "abspath")
-}
-
 # Direct Sockets
 # This uses target_os rather than current_os (which is what is_android is set
 # from) for the case of generating the v8 context snapshot for android. When
index 84e946aa0d3fb9a0bc8544f146d641cb54aec830..d4fe7982305eb9ddaa24ba0474adc18781c9d593 100644 (file)
@@ -5389,6 +5389,7 @@ void WebFrameWidgetImpl::SetDrawsTransparentBackground(
     widget_base_->LayerTreeHost()->set_background_color(SkColors::kTransparent);
   }
 }
+#endif
 
 bool WebFrameWidgetImpl::WillBeDestroyed() const {
   return widget_base_->WillBeDestroyed();
index cb1f9b61b7250f75802c354959f21b3adfa7f687..4d35c4421e908f90db30823bd4b4d74aac8a7188 100644 (file)
@@ -138,133 +138,8 @@ blink_modules_sources("xr") {
     "//services/metrics/public/cpp:ukm_builders",
   ]
 
-  public_deps = [ "//third_party/blink/renderer/modules/gamepad:gamepad" ]
-
-  if (use_efl) {
-    sources -= [
-      "global_event_handlers_xr.h",
-      "vr_service_type_converters.cc",
-      "vr_service_type_converters.h",
-      "xr_anchor.cc",
-      "xr_anchor.h",
-      "xr_anchor_set.cc",
-      "xr_anchor_set.h",
-      "xr_bounded_reference_space.cc",
-      "xr_bounded_reference_space.h",
-      "xr_camera.cc",
-      "xr_camera.h",
-      "xr_canvas_input_provider.cc",
-      "xr_canvas_input_provider.h",
-      "xr_composition_layer.cc",
-      "xr_composition_layer.h",
-      "xr_cpu_depth_information.cc",
-      "xr_cpu_depth_information.h",
-      "xr_cube_map.cc",
-      "xr_cube_map.h",
-      "xr_depth_information.cc",
-      "xr_depth_information.h",
-      "xr_depth_manager.cc",
-      "xr_depth_manager.h",
-      "xr_dom_overlay_state.cc",
-      "xr_dom_overlay_state.h",
-      "xr_enter_fullscreen_observer.cc",
-      "xr_enter_fullscreen_observer.h",
-      "xr_exit_fullscreen_observer.cc",
-      "xr_exit_fullscreen_observer.h",
-      "xr_frame.cc",
-      "xr_frame.h",
-      "xr_frame_provider.cc",
-      "xr_frame_provider.h",
-      "xr_frame_request_callback_collection.cc",
-      "xr_frame_request_callback_collection.h",
-      "xr_grip_space.cc",
-      "xr_grip_space.h",
-      "xr_hand.cc",
-      "xr_hand.h",
-      "xr_hit_test_result.cc",
-      "xr_hit_test_result.h",
-      "xr_hit_test_source.cc",
-      "xr_hit_test_source.h",
-      "xr_image_tracking_result.cc",
-      "xr_image_tracking_result.h",
-      "xr_input_source.cc",
-      "xr_input_source.h",
-      "xr_input_source_array.cc",
-      "xr_input_source_array.h",
-      "xr_input_source_event.cc",
-      "xr_input_source_event.h",
-      "xr_input_sources_change_event.cc",
-      "xr_input_sources_change_event.h",
-      "xr_joint_pose.cc",
-      "xr_joint_pose.h",
-      "xr_joint_space.cc",
-      "xr_joint_space.h",
-      "xr_layer.cc",
-      "xr_layer.h",
-      "xr_light_estimate.cc",
-      "xr_light_estimate.h",
-      "xr_light_probe.cc",
-      "xr_light_probe.h",
-      "xr_object_space.h",
-      "xr_plane.cc",
-      "xr_plane.h",
-      "xr_plane_manager.cc",
-      "xr_plane_manager.h",
-      "xr_plane_set.cc",
-      "xr_plane_set.h",
-      "xr_pose.cc",
-      "xr_pose.h",
-      "xr_projection_layer.cc",
-      "xr_projection_layer.h",
-      "xr_ray.cc",
-      "xr_ray.h",
-      "xr_reference_space.cc",
-      "xr_reference_space.h",
-      "xr_reference_space_event.cc",
-      "xr_reference_space_event.h",
-      "xr_render_state.cc",
-      "xr_render_state.h",
-      "xr_rigid_transform.cc",
-      "xr_rigid_transform.h",
-      "xr_session.cc",
-      "xr_session.h",
-      "xr_session_event.cc",
-      "xr_session_event.h",
-      "xr_session_viewport_scaler.cc",
-      "xr_session_viewport_scaler.h",
-      "xr_setlike.h",
-      "xr_space.cc",
-      "xr_space.h",
-      "xr_sub_image.h",
-      "xr_system.cc",
-      "xr_system.h",
-      "xr_target_ray_space.cc",
-      "xr_target_ray_space.h",
-      "xr_transient_input_hit_test_result.cc",
-      "xr_transient_input_hit_test_result.h",
-      "xr_transient_input_hit_test_source.cc",
-      "xr_utils.cc",
-      "xr_utils.h",
-      "xr_view.cc",
-      "xr_view.h",
-      "xr_viewer_pose.cc",
-      "xr_viewer_pose.h",
-      "xr_viewport.h",
-      "xr_webgl_binding.cc",
-      "xr_webgl_binding.h",
-      "xr_webgl_depth_information.cc",
-      "xr_webgl_depth_information.h",
-      "xr_webgl_layer.cc",
-      "xr_webgl_layer.h",
-      "xr_webgl_sub_image.h",
-    ]
-
-    deps -= [
-      "//device/vr/public/mojom:vr_service_blink",
-      "//services/metrics/public/cpp:ukm_builders",
-    ]
-
-    public_deps -= [ "//third_party/blink/renderer/modules/gamepad:gamepad",
-    "//third_party/blink/renderer/modules/webgpu:webgpu", ]
-  }
+  public_deps = [
+    "//third_party/blink/renderer/modules/gamepad:gamepad",
+    "//third_party/blink/renderer/modules/webgpu:webgpu",
+  ]
 }
index 897686a51cde18e9c7aff60fb4cff61ea85a5398..d9d0b54ef08ac5664ff02aec41e2660902708b51 100644 (file)
@@ -54,7 +54,7 @@ bool IsFreeTypeSystemRasterizer() {
 }
 
 sk_sp<SkTypeface> MakeTypefaceDefaultFontMgr(sk_sp<SkData> data) {
-#if !(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE))
+#if !(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_EFL))
   if (RuntimeEnabledFeatures::FontationsFontBackendEnabled()) {
     std::unique_ptr<SkStreamAsset> stream(new SkMemoryStream(data));
     return SkTypeface_Make_Fontations(std::move(stream), SkFontArguments());
@@ -82,10 +82,12 @@ sk_sp<SkTypeface> MakeTypefaceFallback(sk_sp<SkData> data) {
 }
 #endif
 
+#if !BUILDFLAG(IS_EFL)
 sk_sp<SkTypeface> MakeTypefaceFontations(sk_sp<SkData> data) {
   std::unique_ptr<SkStreamAsset> stream(new SkMemoryStream(data));
   return SkTypeface_Make_Fontations(std::move(stream), SkFontArguments());
 }
+#endif
 
 sk_sp<SkTypeface> MakeVariationsTypeface(
     sk_sp<SkData> data,
@@ -187,7 +189,9 @@ bool WebFontTypefaceFactory::CreateTypeface(sk_sp<SkData> data,
   const FontFormatCheck format_check(data);
   const FontInstantiator instantiator = {
       MakeTypefaceDefaultFontMgr,
+#if !BUILDFLAG(IS_EFL)
       MakeTypefaceFontations,
+#endif
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE)
       MakeTypefaceFallback,
 #endif
index 6668b18e562d6c1a95de347671dc7c8410accec1..a1fe4e7fb9f1418e40e7faad7fed29c3191de793 100644 (file)
@@ -76,15 +76,20 @@ component("image_decoders") {
     sources += [
       "avif/avif_image_decoder.cc",
       "avif/avif_image_decoder.h",
-      "avif/crabbyavif_image_decoder.cc",
-      "avif/crabbyavif_image_decoder.h",
     ]
 
     deps += [
-      "//third_party/crabbyavif",
       "//third_party/libavif",
       "//third_party/libavifinfo",
     ]
+
+    if (enable_rust_cxx) {
+      sources += [
+        "avif/crabbyavif_image_decoder.cc",
+        "avif/crabbyavif_image_decoder.h",
+      ]
+      deps += [ "//third_party/crabbyavif" ]
+    }
   }
 }
 
index f208b6599164cad13cf444e460fb29b92701eab0..f4a2abc6d3cde5b480ae72366ac1e622623db719 100644 (file)
@@ -197,11 +197,17 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
     return "image/bmp";
   }
 #if BUILDFLAG(ENABLE_AV1_DECODER)
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   if (base::FeatureList::IsEnabled(blink::features::kCrabbyAvif)
           ? CrabbyAVIFImageDecoder::MatchesAVIFSignature(fast_reader)
           : AVIFImageDecoder::MatchesAVIFSignature(fast_reader)) {
     return "image/avif";
   }
+#else
+  if (AVIFImageDecoder::MatchesAVIFSignature(fast_reader)) {
+    return "image/avif";
+  }
+#endif
 #endif
 
   return String();
@@ -309,6 +315,11 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
                                                 max_decoded_bytes);
 #if BUILDFLAG(ENABLE_AV1_DECODER)
   } else if (mime_type == "image/avif") {
+#if defined(EWK_BRINGUP)  // FIXME: m130 bringup
+    decoder = std::make_unique<AVIFImageDecoder>(
+        alpha_option, high_bit_depth_decoding_option, color_behavior,
+        max_decoded_bytes, animation_option);
+#else
     if (base::FeatureList::IsEnabled(blink::features::kCrabbyAvif)) {
       decoder = std::make_unique<CrabbyAVIFImageDecoder>(
           alpha_option, high_bit_depth_decoding_option, color_behavior,
@@ -318,6 +329,7 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
           alpha_option, high_bit_depth_decoding_option, color_behavior,
           max_decoded_bytes, animation_option);
     }
+#endif
 #endif
   }
 
index 33d995de5e3d9755806208a883ef6da8a1b2ef77..43e313788a4552db9149ab2ddede6f5ad53b2a47 100644 (file)
@@ -1 +1 @@
-llvmorg-20-init-3847-g69c43468-28\r
+llvmorg-20-init-3847-g69c43468-28
index cab4d6ddfd471dee32113234e07db26988308ec4..d1ee07ead8d06a4a160601d84c31c77d9c4ff37b 100755 (executable)
@@ -9,13 +9,6 @@ import subprocess
 import sys
 import os
 
-# node should be build as statically linked application
-# to do this read: https://github.com/nodejs/node/issues/41497
-# or use:
-# ./configure --fully-static --enable-static --download=all --with-intl=full-icu;
-# for i in out/tools/v8_gypfiles/gen-regexp-special-case.target.mk \
-# out/test_crypto_engine.target.mk; do sed -i 's/\-static//g' $i || echo "nevermind"; done
-# make -j$(nproc)
 
 def GetBinaryPath():
   if platform.machine() == 'arm64':
index 35615b6b4fc6394d608e6bc2918343ca2f88fede..9693c19ba198c07c0173eb5c9cf21248c891274a 100644 (file)
@@ -246,8 +246,8 @@ message VideoDecoderConfig {
     PIXEL_FORMAT_NV24 = 41;
     PIXEL_FORMAT_P210LE = 42;
     PIXEL_FORMAT_P410LE = 43;
-    PIXEL_FORMAT_TBM_SURFACE = 43;
-    PIXEL_FORMAT_ENCODED = 44;
+    PIXEL_FORMAT_TBM_SURFACE = 44;
+    PIXEL_FORMAT_ENCODED = 45;
   };
 
   // Proto version of Chrome's media::ColorSpace.
index 9f95190488e77f22d60fd64e52f807bc5f8e75c8..2bf5f5b070fde278ae25d983c2d070a622671524 100644 (file)
@@ -22,7 +22,6 @@
 #include <cstdint>
 #include <optional>
 #include <string>
-#include <cstdint>
 
 namespace perfetto {
 namespace base {
index e6cef14909d7dab58d1c4abbbe3e536c696910fb..1c01c1787ea9ab1972159ce4efd65e225040cee6 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, std::nullptr_t>;
+      std::variant<int64_t, double, OwnedString, OwnedBytes, nullptr_t>;
 
   StoredSqlValue(SqlValue value) {
     switch (value.type) {
@@ -134,7 +134,7 @@ struct StoredSqlValue {
   }
 
   SqlValue AsSqlValue() {
-    if (std::holds_alternative<std::nullptr_t>(data)) {
+    if (std::holds_alternative<nullptr_t>(data)) {
       return SqlValue();
     } else if (std::holds_alternative<int64_t>(data)) {
       return SqlValue::Long(std::get<int64_t>(data));
index 5496a10bbae4ec4db117b4110764fa02bb52f0a1..02b23eebd43338771c9b1859fd03075b2f8b0124 100644 (file)
@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/memory/BUILD.gn
 # Copyright (C) 2024 The Android Open Source Project
-========
-# Copyright 2021 Google LLC
->>>>>>>> e081458f23a2 (Upload upstream chromium 130.0.6723.116 Part-3):third_party/catapult/third_party/gsutil/third_party/google-auth-library-python-httplib2/.github/.OwlBot.yaml
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<<< HEAD:third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/memory/BUILD.gn
 import("../../../../../gn/perfetto_sql.gni")
 
 perfetto_sql_source_set("callstacks") {
   sources = [ "stack_profile.sql" ]
 }
-========
-docker:
-  image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-
-begin-after-commit-hash: ee56c3493ec6aeb237ff515ecea949710944a20f
->>>>>>>> e081458f23a2 (Upload upstream chromium 130.0.6723.116 Part-3):third_party/catapult/third_party/gsutil/third_party/google-auth-library-python-httplib2/.github/.OwlBot.yaml
index 4665731eb7e4cc3495b2519013110af6eaf03166..42654ebabaf8a004cbea3ae2f67feb048066e0e1 100644 (file)
@@ -21,4 +21,4 @@ perfetto_sql_source_set("cpu") {
     "idle_stats.sql",
   ]
   deps = [ "utilization" ]
-}
\ No newline at end of file
+}
old mode 100755 (executable)
new mode 100644 (file)
index 52ebb02..64dd73e
@@ -1,11 +1,10 @@
-#!/bin/bash
-# Copyright 2023 Google LLC
+# Copyright (C) 2024 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# A customized test runner for samples.
-#
-# For periodic builds, you can specify this file for testing against head.
-
-<<<<<<<< HEAD:third_party/catapult/third_party/gsutil/third_party/google-auth-library-python-httplib2/.kokoro/test-samples-against-head.sh
-# `-e` enables the script to automatically fail when a command fails
-# `-o pipefail` sets the exit code to the rightmost comment to exit with a non-zero
-set -eo pipefail
-# Enables `**` to include files nested inside sub-folders
-shopt -s globstar
+import("../../../../../gn/perfetto_sql.gni")
 
-exec .kokoro/test-samples-impl.sh
-========
 perfetto_sql_source_set("viz") {
   sources = [
     "flamegraph.sql",
@@ -34,4 +22,3 @@ perfetto_sql_source_set("viz") {
   ]
   deps = [ "summary" ]
 }
->>>>>>>> 806dc066d148 (Upload upstream chromium 130.0.6723.116 Part-2):third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/viz/BUILD.gn
index b07c09c7e53a0b2a1ff4fab9451a67c000d2af9b..3c1c5745684a2d744f65867e63da050ff517d7eb 100644 (file)
@@ -10,22 +10,19 @@ source_set("fend_core") {
     "fend_core.cc",
     "fend_core.h",
   ]
-
-  deps = [ "//base" ]
-  if (enable_rust) {
-    deps = [ ":fend_core_ffi_glue" ]
-  }
+  deps = [
+    ":fend_core_ffi_glue",
+    "//base",
+  ]
 }
 
-if (enable_rust) {
-  rust_static_library("fend_core_ffi_glue") {
-    allow_unsafe = true  # Needed for FFI that underpins the `cxx` crate.
-    crate_root = "fend_core_ffi_glue.rs"
-    sources = [ "fend_core_ffi_glue.rs" ]
-    cxx_bindings = [ "fend_core_ffi_glue.rs" ]
-    visibility = [ ":fend_core" ]
-    deps = [ "//third_party/rust/fend_core/v1:lib" ]
-  }
+rust_static_library("fend_core_ffi_glue") {
+  allow_unsafe = true  # Needed for FFI that underpins the `cxx` crate.
+  crate_root = "fend_core_ffi_glue.rs"
+  sources = [ "fend_core_ffi_glue.rs" ]
+  cxx_bindings = [ "fend_core_ffi_glue.rs" ]
+  visibility = [ ":fend_core" ]
+  deps = [ "//third_party/rust/fend_core/v1:lib" ]
 }
 
 source_set("unit_tests") {
index 9ca5bda61e2e6d6e15d0d978be253b76d044496b..a2818737e25642336060357459e277ed6dc7eede 100644 (file)
@@ -44,6 +44,12 @@ default_args = {
   # Don't include webrtc's builtin task queue implementation.
   rtc_link_task_queue_impl = false
 
+  # When building with Chromium, `webrtc::Location` is replaced by
+  # `base::Location`. Since WebRTC doesn't use `public_deps` (webrtc:8603), it
+  # would fail to propagate the dependency internally. Instead WebRTC let its
+  # embedders to define it globally for all of its targets.
+  rtc_common_public_deps = [ "//base" ]
+
   # Don't include the iLBC audio codec.
   # TODO(bugs.webrtc.org/8396): Once WebRTC gets rid of its internal
   # deps on codecs, we can remove this.
@@ -54,18 +60,25 @@ default_args = {
   crashpad_dependencies = "chromium"
 
   # Override ANGLE's Vulkan dependencies.
-  angle_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
-  angle_vulkan_loader_dir = "//third_party/vulkan-deps/vulkan-loader/src"
-  angle_vulkan_tools_dir = "//third_party/vulkan-deps/vulkan-tools/src"
+  angle_vulkan_headers_dir = "//third_party/vulkan-headers/src"
+  angle_vulkan_loader_dir = "//third_party/vulkan-loader/src"
+  angle_vulkan_tools_dir = "//third_party/vulkan-tools/src"
   angle_vulkan_validation_layers_dir =
-      "//third_party/vulkan-deps/vulkan-validation-layers/src"
+      "//third_party/vulkan-validation-layers/src"
+
+  # Override VMA's Vulkan dependencies.
+  vma_vulkan_headers_dir = "//third_party/vulkan-headers/src"
 
   # Overwrite default args declared in the Fuchsia sdk
   fuchsia_sdk_readelf_exec =
       "//third_party/llvm-build/Release+Asserts/bin/llvm-readelf"
-  fuchsia_target_api_level = 9
+
+  # Overwrite default args declared in the pdfium library
+  pdf_partition_alloc_dir = "//base/allocator/partition_allocator"
 
   devtools_visibility = [ "*" ]
+
+  clang_unsafe_buffers_paths = "//build/config/unsafe_buffers_paths.txt"
 }
 
 # These are the targets to skip header checking by default. The files in targets
@@ -73,10 +86,6 @@ default_args = {
 # their includes checked for proper dependencies when you run either
 # "gn check" or "gn gen --check".
 no_check_targets = [
-  # crbug.com/1158989
-  "//headless:headless_renderer",  # 12 errors
-  "//headless:headless_shared_sources",  # 2 errors
-
   # //v8, https://crbug.com/v8/7330
   "//v8/src/inspector:inspector",  # 20 errors
   "//v8/test/cctest:cctest_sources",  # 15 errors
@@ -84,12 +93,6 @@ no_check_targets = [
   "//v8:cppgc_base",  # 1 error
   "//v8:v8_internal_headers",  # 11 errors
   "//v8:v8_libplatform",  # 2 errors
-
-  # After making partition_alloc a standalone library, remove partition_alloc
-  # target from the skip list, because partition_aloc will depend on its own
-  # base.
-  # partition alloc standalone library bug is https://crbug.com/1151236.
-  "//base/allocator/partition_allocator:partition_alloc",  # 292 errors
 ]
 
 # These are the list of GN files that run exec_script. This whitelist exists
@@ -177,6 +180,6 @@ exec_script_whitelist =
       "//tools/grit/grit_rule.gni",
       "//tools/gritsettings/BUILD.gn",
 
-      "//third_party/electron_node/deps/base64/BUILD.gn", # enable_wrt_js
-      "//third_party/electron_node/deps/base64/unofficial.gni", # enable_wrt_js
+      "//third_party/electron_node/deps/base64/BUILD.gn",  # enable_wrt_js
+      "//third_party/electron_node/deps/base64/unofficial.gni",  # enable_wrt_js
     ]
index 24897c88adb64ee8bbebbbaba991f1033527f3a3..24ecd519c96d1e6186bcb356f71d50318d695dd6 100755 (executable)
@@ -112,6 +112,7 @@ COMMON_GN_PARAMETERS="use_libjpeg_turbo=true
                       use_aura=true
                       use_kerberos=false
                       use_ozone=true
+                      ozone_auto_platforms=false
                       toolkit_views=true
                       use_pango=false
                       use_cairo=false
@@ -151,7 +152,6 @@ add_desktop_flags() {
                              dcheck_always_on=false
                              enable_nacl=false
                              build_chrome=${build_chrome}
-                             use_gold=true
                              use_lld=false
                             "
 }
index 8d9a09c84d92c38d4cb0715c42855eab7d797a52..4bb8dfea5119637b90feccdb647debe7a14d2406 100644 (file)
@@ -146,13 +146,10 @@ void MessagePumpEcore::Run(Delegate* delegate) {
     if (more_work_is_plausible)
       continue;
 
-    more_work_is_plausible = state_->delegate->DoIdleWork();
+    state_->delegate->DoIdleWork();
     if (state_->should_quit)
       break;
 
-    if (more_work_is_plausible)
-      continue;
-
     // Check for delayed work.
     if (next_work_info.delayed_run_time.is_max()) {
       ecore_main_loop_iterate_may_block(EINA_TRUE);
index 258856fc344140439b8f4f9dcc7a291ddb73257b..cf0e4e3cbaa6e9a43360d88f4f05185d9ac93328 100644 (file)
@@ -52,7 +52,7 @@ void MessagePumpForUIEfl::Run(Delegate* delegate) {
     if (did_work)
       continue;
 
-    did_work = delegate->DoIdleWork();
+    delegate->DoIdleWork();
     if (!keep_running_)
       break;
   }
@@ -160,11 +160,7 @@ void MessagePumpForUIEfl::DoWork() {
     return;
   }
 
-  more_work_is_plausible |= delegate_->DoIdleWork();
-  if (more_work_is_plausible) {
-    ScheduleWork();
-    return;
-  }
+  delegate_->DoIdleWork();
 
   if (!next_work_info.delayed_run_time.is_max())
     ScheduleDelayedWork(next_work_info);
index 2d87914d945460f911f33174ea62f89a565f77f3..984865d754149b6068c7f78231f22ac12d4b92f7 100644 (file)
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//tizen_src/build/config/tizen_features.gni")
 import("//ppapi/buildflags/buildflags.gni")
+import("//tizen_src/build/config/tizen_features.gni")
 
 ##############################################################################
 # Configs
@@ -83,6 +83,8 @@ external_content_browser_efl_sources = [
   "//tizen_src/chromium_impl/content/browser/date_time_chooser_efl.h",
   "//tizen_src/chromium_impl/content/browser/input_picker/input_picker_base.cc",
   "//tizen_src/chromium_impl/content/browser/input_picker/input_picker_base.h",
+  "//tizen_src/chromium_impl/content/browser/inspector/devtools_util_manager.cc",
+  "//tizen_src/chromium_impl/content/browser/inspector/devtools_util_manager.h",
   "//tizen_src/chromium_impl/content/browser/javascript_dialog/javascript_modal_dialog.cc",
   "//tizen_src/chromium_impl/content/browser/javascript_dialog/javascript_modal_dialog.h",
   "//tizen_src/chromium_impl/content/browser/public/browser/webview_delegate.h",
@@ -94,14 +96,6 @@ external_content_browser_efl_sources = [
   "//tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.h",
   "//tizen_src/chromium_impl/content/browser/screen_orientation/screen_orientation_delegate_efl.cc",
   "//tizen_src/chromium_impl/content/browser/screen_orientation/screen_orientation_delegate_efl.h",
-  "//tizen_src/chromium_impl/content/browser/selection/selection_box_efl.cc",
-  "//tizen_src/chromium_impl/content/browser/selection/selection_box_efl.h",
-  "//tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc",
-  "//tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h",
-  "//tizen_src/chromium_impl/content/browser/selection/selection_handle_efl.cc",
-  "//tizen_src/chromium_impl/content/browser/selection/selection_handle_efl.h",
-  "//tizen_src/chromium_impl/content/browser/selection/selection_magnifier_efl.cc",
-  "//tizen_src/chromium_impl/content/browser/selection/selection_magnifier_efl.h",
   "//tizen_src/chromium_impl/content/browser/select_picker/form_navigable_picker.cc",
   "//tizen_src/chromium_impl/content/browser/select_picker/form_navigable_picker.h",
   "//tizen_src/chromium_impl/content/browser/select_picker/select_picker_base.cc",
@@ -112,6 +106,14 @@ external_content_browser_efl_sources = [
   "//tizen_src/chromium_impl/content/browser/select_picker/select_picker_tv_base.h",
   "//tizen_src/chromium_impl/content/browser/select_picker/select_picker_util.cc",
   "//tizen_src/chromium_impl/content/browser/select_picker/select_picker_util.h",
+  "//tizen_src/chromium_impl/content/browser/selection/selection_box_efl.cc",
+  "//tizen_src/chromium_impl/content/browser/selection/selection_box_efl.h",
+  "//tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc",
+  "//tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h",
+  "//tizen_src/chromium_impl/content/browser/selection/selection_handle_efl.cc",
+  "//tizen_src/chromium_impl/content/browser/selection/selection_handle_efl.h",
+  "//tizen_src/chromium_impl/content/browser/selection/selection_magnifier_efl.cc",
+  "//tizen_src/chromium_impl/content/browser/selection/selection_magnifier_efl.h",
   "//tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.cc",
   "//tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.h",
   "//tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc",
@@ -122,19 +124,12 @@ external_content_browser_efl_sources = [
   "//tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h",
   "//tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.cc",
   "//tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.h",
-  "//tizen_src/chromium_impl/content/browser/inspector/devtools_util_manager.cc",
-  "//tizen_src/chromium_impl/content/browser/inspector/devtools_util_manager.h",
   "//tizen_src/chromium_impl/content/public/browser/certificates_utils.cc",
   "//tizen_src/chromium_impl/content/public/browser/certificates_utils.h",
   "//tizen_src/chromium_impl/content/public/browser/web_contents_efl_delegate.h",
   "//tizen_src/chromium_impl/content/public/browser/web_contents_view_efl_delegate.h",
 ]
 
-external_content_browser_efl_sources += [
-  "//content/browser/renderer_host/ui_events_helper.cc",
-  "//content/browser/renderer_host/ui_events_helper.h",
-]
-
 if (is_tizen) {
   external_exclude_content_browser_efl_sources = [
     "tracing/tracing_ui.cc",
@@ -169,8 +164,8 @@ if (tizen_multimedia) {
 
 if (tizen_pepper_extensions && enable_plugins) {
   external_content_browser_efl_sources += [
-    "//tizen_src/chromium_impl/content/browser/renderer_host/pepper/browser_pepper_host_factory_efl.h",
     "//tizen_src/chromium_impl/content/browser/renderer_host/pepper/browser_pepper_host_factory_efl.cc",
+    "//tizen_src/chromium_impl/content/browser/renderer_host/pepper/browser_pepper_host_factory_efl.h",
     "//tizen_src/chromium_impl/content/browser/renderer_host/pepper/pepper_extension_system_host.cc",
     "//tizen_src/chromium_impl/content/browser/renderer_host/pepper/pepper_extension_system_host.h",
     "//tizen_src/chromium_impl/content/browser/renderer_host/pepper/pepper_remote_controller_host.cc",
@@ -190,5 +185,5 @@ if (tizen_web_speech_recognition) {
     "//tizen_src/chromium_impl/content/browser/speech/tizen_speech_recognition_manager_delegate.h",
     "//tizen_src/chromium_impl/content/browser/speech/tts_platform_impl_tizen.cc",
     "//tizen_src/chromium_impl/content/browser/speech/tts_platform_impl_tizen.h",
-    ]
+  ]
 }
index 47595a923c8bd20ce8d22856906c6dc869d2db26..3a743148413d4f0845bf0db25cfae338cea12f3f 100644 (file)
@@ -190,8 +190,8 @@ void RWHVAuraCommonHelperEfl::OnSelectionRectReceived(
 }
 
 void RWHVAuraCommonHelperEfl::OnMouseOrTouchEvent(ui::Event* event) {
-  if (event->type() == ui::ET_MOUSE_PRESSED ||
-      event->type() == ui::ET_TOUCH_PRESSED) {
+  if (event->type() == ui::EventType::kMousePressed ||
+      event->type() == ui::EventType::kTouchPressed) {
     FocusRWHVA();
   }
 }
@@ -551,10 +551,11 @@ bool RWHVAuraCommonHelperEfl::TouchEventsEnabled() {
 }
 
 void RWHVAuraCommonHelperEfl::OnGestureEvent(ui::GestureEvent* event) {
-  if (event->type() == ui::ET_GESTURE_BEGIN)
+  if (event->type() == ui::EventType::kGestureBegin) {
     HandleGestureBegin();
-  else if (event->type() == ui::ET_GESTURE_END)
+  } else if (event->type() == ui::EventType::kGestureEnd) {
     HandleGestureEnd();
+  }
 
   blink::WebGestureEvent gesture_event = MakeWebGestureEventFromUIEvent(*event);
   gesture_event.SetPositionInWidget(event->location_f());
@@ -581,8 +582,9 @@ void RWHVAuraCommonHelperEfl::SendGestureEvent(
   }
 
   if (event_type != blink::WebInputEvent::Type::kUndefined) {
-    rwhv_aura_->host()->ForwardGestureEventWithLatencyInfo(
-        event, CreateLatencyInfo(event));
+    rwhv_aura_->host()
+        ->GetRenderInputRouter()
+        ->ForwardGestureEventWithLatencyInfo(event, CreateLatencyInfo(event));
   }
 }
 
index 8445b0fc1458bf0417b73c41f501bc43ddf69661..463d96914f7f1d8e9093d45f463f384df907030f 100644 (file)
@@ -686,16 +686,17 @@ void SelectionControllerEfl::HandleGesture(blink::WebGestureEvent& event) {
   blink::WebInputEvent::Type event_type = event.GetType();
   if (event_type == blink::WebInputEvent::Type::kGestureTap) {
     HandlePostponedGesture(event.PositionInWidget().x(),
-                           event.PositionInWidget().y(), ui::ET_GESTURE_TAP);
+                           event.PositionInWidget().y(),
+                           ui::EventType::kGestureTap);
   } else if (event_type == blink::WebInputEvent::Type::kGestureShowPress) {
     HandlePostponedGesture(event.PositionInWidget().x(),
                            event.PositionInWidget().y(),
-                           ui::ET_GESTURE_SHOW_PRESS);
+                           ui::EventType::kGestureShowPress);
   } else if (event_type == blink::WebInputEvent::Type::kGestureLongPress) {
     selection_change_reason_ = Reason::LongPressStarted;
     HandlePostponedGesture(event.PositionInWidget().x(),
                            event.PositionInWidget().y(),
-                           ui::ET_GESTURE_LONG_PRESS);
+                           ui::EventType::kGestureLongPress);
     long_mouse_press_ = true;
   }
 
@@ -722,7 +723,7 @@ void SelectionControllerEfl::HandleGesture(blink::WebGestureEvent& event) {
 void SelectionControllerEfl::HandlePostponedGesture(int x,
                                                     int y,
                                                     ui::EventType type) {
-  DVLOG(0) << "HandlePostponedGesture :: " << type;
+  DVLOG(0) << "HandlePostponedGesture :: " << static_cast<int>(type);
   RenderWidgetHostViewAura* rwhva = static_cast<RenderWidgetHostViewAura*>(
       web_contents()->GetRenderWidgetHostView());
 
@@ -730,15 +731,15 @@ void SelectionControllerEfl::HandlePostponedGesture(int x,
   if (rwhva && rwhva_->aura_efl_helper())
     point = rwhva->aura_efl_helper()->ConvertPointInViewPix(point);
   switch (type) {
-    case ui::ET_GESTURE_LONG_PRESS: {
+    case ui::EventType::kGestureLongPress: {
       ClearSelectionViaEWebView();
       HideHandleAndContextMenu();
       // Long press data will call to WebContentsViewDelegateEfl.
       // It is called by the chain that handles FrameHostMsg_ContextMenu.
       break;
     }
-    case ui::ET_GESTURE_TAP:
-    case ui::ET_GESTURE_SHOW_PRESS: {
+    case ui::EventType::kGestureTap:
+    case ui::EventType::kGestureShowPress: {
       // Do not do anything.
       break;
     }
index 4ae8a29235718aac97a391ec5806b47edfba710e..04a0564da0197536fd567b181ce0d96b74eb995f 100644 (file)
@@ -16,8 +16,6 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_plugin_guest_manager.h"
 #include "content/public/browser/content_browser_client.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/webview_delegate.h"
index 230f90fc178f79ce6aae0290646a473fb87ea9c4..51b7d58ffe3ff817687ff0977f06d29a8bddb010 100644 (file)
@@ -4,6 +4,7 @@
 
 #include "certificates_utils.h"
 
+#include "base/containers/span.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_split.h"
@@ -55,7 +56,7 @@ net::ScopedCERTCertificateList GetCertListFromFile(
   net::ScopedCERTCertificateList cert_list;
   if (base::ReadFileToString(file_path, &cert_data)) {
     cert_list = net::x509_util::CreateCERTCertificateListFromBytes(
-        cert_data.data(), cert_data.size(), net::X509Certificate::FORMAT_AUTO);
+        base::as_byte_span(cert_data), net::X509Certificate::FORMAT_AUTO);
   } else {
     LOG(ERROR) << "Could not read file \"" << file_path.AsUTF8Unsafe()
                << "\" for loading CA certs. Please check permissions!";
index fd06cd35d481ecbeaec633bdf3c4ebadbe51b062..f4df02fd2be255683fa6e491595ab5288a1839ab 100644 (file)
@@ -73,8 +73,8 @@ void CommonRendererClient::PrepareErrorPage(
     error_message =
         base::StringPrintf(error_message.c_str(), gurl.host().c_str());
 #else
-    error_message = base::StringPrintf(error_message.c_str(),
-                             error.url().GetString().Ascii().c_str());
+    error_message = base::StringPrintfNonConstexpr(
+        error_message.c_str(), error.url().GetString().Ascii().c_str());
 #endif
     *error_html =
         "<html>"
index f4607b4ee08aef6cec3d06511af9c32f64cddfb0..b9f89dfd12a022f36424749f7359b88c2e33b8d1 100644 (file)
@@ -167,10 +167,11 @@ void ClipboardEfl::ReadBookmark(const DataTransferEndpoint* data_dst,
   NOTIMPLEMENTED();
 }
 
-void ClipboardEfl::ReadCustomData(ClipboardBuffer clipboard_type,
-                                  const std::u16string& type,
-                                  const DataTransferEndpoint* data_dst,
-                                  std::u16string* result) const {
+void ClipboardEfl::ReadDataTransferCustomData(
+    ClipboardBuffer clipboard_type,
+    const std::u16string& type,
+    const DataTransferEndpoint* data_dst,
+    std::u16string* result) const {
   NOTIMPLEMENTED();
 }
 
@@ -186,20 +187,20 @@ void ClipboardEfl::ReadData(const ClipboardFormatType& format,
   NOTIMPLEMENTED();
 }
 
-void ClipboardEfl::WriteText(base::StringPiece text) {
+void ClipboardEfl::WriteText(std::string_view text) {
   ClipboardHelperEfl::GetInstance()->SetData(
       std::string(text.data(), text.length()),
       ClipboardDataTypeEfl::PLAIN_TEXT);
 }
 
-void ClipboardEfl::WriteHTML(base::StringPiece markup,
-                             std::optional<base::StringPiece> source_url) {
+void ClipboardEfl::WriteHTML(std::string_view markup,
+                             std::optional<std::string_view> source_url) {
   ClipboardHelperEfl::GetInstance()->SetData(
       std::string(markup.data(), markup.length()),
       ClipboardDataTypeEfl::MARKUP);
 }
 
-void ClipboardEfl::WriteSvg(base::StringPiece markup) {
+void ClipboardEfl::WriteSvg(std::string_view markup) {
   NOTIMPLEMENTED();
 }
 
@@ -207,12 +208,11 @@ void ClipboardEfl::WriteFilenames(std::vector<ui::FileInfo> filenames) {
   NOTIMPLEMENTED();
 }
 
-void ClipboardEfl::WriteRTF(base::StringPiece rtf) {
+void ClipboardEfl::WriteRTF(std::string_view rtf) {
   NOTIMPLEMENTED();
 }
 
-void ClipboardEfl::WriteBookmark(base::StringPiece title,
-                                 base::StringPiece url) {
+void ClipboardEfl::WriteBookmark(std::string_view title, std::string_view url) {
   NOTIMPLEMENTED();
 }
 
index 480edddf065a523f55629325baedcbc01cfe62d6..14042b3b939e1dada21a79998145eb640dba08b1 100644 (file)
@@ -53,10 +53,10 @@ class ClipboardEfl: public Clipboard {
   void ReadPng(ClipboardBuffer buffer,
                const DataTransferEndpoint* data_dst,
                ReadPngCallback callback) const override;
-  void ReadCustomData(ClipboardBuffer buffer,
-                      const std::u16string& type,
-                      const DataTransferEndpoint* data_dst,
-                      std::u16string* result) const override;
+  void ReadDataTransferCustomData(ClipboardBuffer buffer,
+                                  const std::u16string& type,
+                                  const DataTransferEndpoint* data_dst,
+                                  std::u16string* result) const override;
   void ReadFilenames(ClipboardBuffer buffer,
                      const DataTransferEndpoint* data_dst,
                      std::vector<ui::FileInfo>* result) const override;
@@ -75,13 +75,13 @@ class ClipboardEfl: public Clipboard {
       std::vector<Clipboard::PlatformRepresentation> platform_representations,
       std::unique_ptr<DataTransferEndpoint> data_src,
       uint32_t privacy_types) override;
-  void WriteText(base::StringPiece text) override;
-  void WriteHTML(base::StringPiece markup,
-                 std::optional<base::StringPiece> source_url) override;
-  void WriteSvg(base::StringPiece markup) override;
-  void WriteRTF(base::StringPiece rtf) override;
+  void WriteText(std::string_view text) override;
+  void WriteHTML(std::string_view markup,
+                 std::optional<std::string_view> source_url) override;
+  void WriteSvg(std::string_view markup) override;
+  void WriteRTF(std::string_view rtf) override;
   void WriteFilenames(std::vector<ui::FileInfo> filenames) override;
-  void WriteBookmark(base::StringPiece title, base::StringPiece url) override;
+  void WriteBookmark(std::string_view title, std::string_view url) override;
   void WriteWebSmartPaste() override;
   void WriteBitmap(const SkBitmap& bitmap) override;
   void WriteData(const ClipboardFormatType& format,
index 91ca65121efdc6feffef317df4d3a64b45986fed..b6a49990203d2dbdb4f64f6572bfb8fcb8ce6cb6 100644 (file)
@@ -124,18 +124,18 @@ int EvasModifiersToEventFlags(const Evas_Modifier* modifiers,
 static EventType EvasTouchEventTypeToUI(Evas_Touch_Point_State evas_touch) {
   switch (evas_touch) {
     case EVAS_TOUCH_POINT_DOWN:
-      return ET_TOUCH_PRESSED;
+      return EventType::kTouchPressed;
     case EVAS_TOUCH_POINT_MOVE:
-      return ET_TOUCH_MOVED;
+      return EventType::kTouchMoved;
     case EVAS_TOUCH_POINT_UP:
-      return ET_TOUCH_RELEASED;
+      return EventType::kTouchReleased;
     case EVAS_TOUCH_POINT_CANCEL:
-      return ET_TOUCH_CANCELLED;
+      return EventType::kTouchCancelled;
     case EVAS_TOUCH_POINT_STILL:
     // Not handled by chromium, should not be passed here.
     default:
       NOTREACHED();
-      return ET_UNKNOWN;
+      return EventType::kUnknown;
   }
 }
 
@@ -249,7 +249,7 @@ TouchEvent MakeTouchEvent(Evas_Coord_Point pt,
 
 template <class EVT>
 KeyEvent MakeWebKeyEvent(bool pressed, const EVT* evt) {
-  EventType type = pressed ? ET_KEY_PRESSED : ET_KEY_RELEASED;
+  EventType type = pressed ? EventType::kKeyPressed : EventType::kKeyReleased;
   int native_key_code = evt->keycode;
   KeyboardCode windows_key_code = UIKeyCodeFromEflKey(evt->key);
 
@@ -510,8 +510,8 @@ void EflEventHandler::OnMouseDown(void* data,
   if (thiz->GetTouchEventsEnabled(ev)) {
     thiz->ProcessTouchEvents(ev->timestamp, false);
   } else {
-    MouseEvent event =
-        MakeWebMouseEvent(ET_MOUSE_PRESSED, ev, thiz->GetTopControlsHeight());
+    MouseEvent event = MakeWebMouseEvent(EventType::kMousePressed, ev,
+                                         thiz->GetTopControlsHeight());
     EflPlatformEventSource::GetInstance()->DispatchEflEvent(&event);
   }
 }
@@ -528,8 +528,8 @@ void EflEventHandler::OnMouseUp(void* data,
   if (thiz->GetTouchEventsEnabled(ev)) {
     thiz->ProcessTouchEvents(ev->timestamp, false);
   } else {
-    MouseEvent event =
-        MakeWebMouseEvent(ET_MOUSE_RELEASED, ev, thiz->GetTopControlsHeight());
+    MouseEvent event = MakeWebMouseEvent(EventType::kMouseReleased, ev,
+                                         thiz->GetTopControlsHeight());
     EflPlatformEventSource::GetInstance()->DispatchEflEvent(&event);
   }
 }
@@ -550,8 +550,8 @@ void EflEventHandler::OnMouseMove(void* data,
     int button = EvasToUIMouseButton(ev->buttons);
     int event_flags = EvasModifiersToEventFlags(ev->modifiers);
     event_flags |= button;
-    MouseEvent event(ET_MOUSE_MOVED, location, location, base::TimeTicks::Now(),
-                     event_flags, button);
+    MouseEvent event(EventType::kMouseMoved, location, location,
+                     base::TimeTicks::Now(), event_flags, button);
     const float sf = GetDeviceScaleFactor();
     ui::MouseEvent::DispatcherApi(&event).set_movement(
         gfx::Vector2dF((ev->cur.canvas.x / sf - ev->prev.canvas.x / sf),
index eb53ad8689cb33807439f6094b25adc189043063..2e86f862ea50b269ba4978ffb085083bcad875e1 100644 (file)
@@ -25,6 +25,7 @@ class EflInputMethodContext : public LinuxInputMethodContext {
   void SetSurroundingText(
       const std::u16string& text,
       const gfx::Range& text_range,
+      const gfx::Range& composition_range,
       const gfx::Range& selection_range,
       const std::optional<ui::GrammarFragment>& fragment,
       const std::optional<AutocorrectInfo>& autocorrect) override {}
index 506871db5c224c11f1df22ca4fb37591e51ce3c5..6287bfc6c8402b3de476126a5664b5e0fc24905c 100644 (file)
@@ -918,7 +918,7 @@ void IMContextEfl::ProcessNextKeyUpEvent() {
     return;
 
   LOG(INFO) << "ProcessNextKeyUpEvent,key:" << keyup_event_queue_.front();
-  KeyEvent event(ET_KEY_RELEASED, keyup_event_queue_.front(), EF_NONE,
+  KeyEvent event(EventType::kKeyReleased, keyup_event_queue_.front(), EF_NONE,
                  base::TimeTicks());
 #if BUILDFLAG(IS_TIZEN_TV)
   // Needed for HBBTV single window, multiwebview scenario.
index 5259b6b59b26c99db48f8c22ed9bb0b3b47332a5..03d8864ef5965a38f54654158ec7d9592b302cb7 100644 (file)
@@ -101,11 +101,11 @@ syncer::SyncService* AutofillClientEfl::GetSyncService() {
   return nullptr;
 }
 
-void AutofillClientEfl::ShowAutofillSettings(
-    FillingProduct main_filling_product) {
+void AutofillClientEfl::ShowAutofillSettings(SuggestionType suggestion_type) {
   NOTIMPLEMENTED();
 }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 void AutofillClientEfl::ConfirmSaveCreditCardLocally(
     const CreditCard& card,
     SaveCreditCardOptions options,
@@ -126,21 +126,24 @@ void AutofillClientEfl::ConfirmCreditCardFillAssist(
     base::OnceClosure callback) {
   NOTIMPLEMENTED();
 }
+#endif
 
-void AutofillClientEfl::ShowAutofillSuggestions(
+AutofillClient::SuggestionUiSessionId
+AutofillClientEfl::ShowAutofillSuggestions(
     const PopupOpenArgs& open_args,
     base::WeakPtr<AutofillSuggestionDelegate> delegate) {
   DCHECK(web_contents_);
   LOG(INFO) << "[Autofill] " << __FUNCTION__
             << " suggestions.size : " << open_args.suggestions.size();
+  SuggestionUiSessionId session_id;
 #if defined(TIZEN_AUTOFILL_FW)
   LOG(INFO) << "[Autofill] " << __FUNCTION__
             << " Autofill fw is enabled. return directly";
-  return;
+  return session_id;
 #endif
   // Do not show sugestions when Remember form data is disabled
   if (!IsAutocompleteSavingEnabled())
-    return;
+    return session_id;
 
   if (GetOrCreatePopupController()) {
     popup_controller_->InitFormData(open_args.suggestions, delegate);
@@ -152,6 +155,7 @@ void AutofillClientEfl::ShowAutofillSuggestions(
 #endif
     popup_controller_->Show();
   }
+  return session_id;
 }
 
 void AutofillClientEfl::UpdateAutofillDataListValues(
@@ -159,6 +163,7 @@ void AutofillClientEfl::UpdateAutofillDataListValues(
   NOTIMPLEMENTED();
 }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 bool AutofillClientEfl::HasCreditCardScanFeature() const {
   return false;
 }
@@ -166,6 +171,7 @@ bool AutofillClientEfl::HasCreditCardScanFeature() const {
 void AutofillClientEfl::ScanCreditCard(CreditCardScanCallback callback) {
   NOTIMPLEMENTED();
 }
+#endif
 
 bool AutofillClientEfl::IsContextSecure() const {
   content::SSLStatus ssl_status;
@@ -309,11 +315,13 @@ AutofillPopupViewEfl * AutofillClientEfl::GetOrCreatePopupController() {
   return popup_controller_;
 }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 void AutofillClientEfl::DidFillOrPreviewField(
     const std::u16string& autofilled_value,
     const std::u16string& profile_full_name) {
   NOTIMPLEMENTED();
 }
+#endif
 
 bool AutofillClientEfl::IsOffTheRecord() const {
   return web_contents_->GetBrowserContext()->IsOffTheRecord();
@@ -401,6 +409,7 @@ gfx::RectF AutofillClientEfl::GetElementBoundsInScreen(
   return element_bounds + view_offset;
 }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 void AutofillClientEfl::ShowWebauthnOfferDialog(
     WebauthnDialogCallback offer_dialog_callback) {
   NOTIMPLEMENTED();
@@ -419,17 +428,19 @@ bool AutofillClientEfl::CloseWebauthnDialog() {
   NOTIMPLEMENTED();
   return false;
 }
+#endif
 
 void AutofillClientEfl::PinAutofillSuggestions() {
   NOTIMPLEMENTED();
 }
-
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 void AutofillClientEfl::UpdatePopup(
     const std::vector<Suggestion>& suggestions,
     FillingProduct main_filling_product,
     AutofillSuggestionTriggerSource trigger_source) {
   NOTIMPLEMENTED();
 }
+#endif
 
 const GURL& AutofillClientEfl::GetLastCommittedPrimaryMainFrameURL() const {
   DCHECK(web_contents_);
@@ -449,10 +460,11 @@ translate::TranslateDriver* AutofillClientEfl::GetTranslateDriver() {
   NOTIMPLEMENTED();
   return nullptr;
 }
+
 void AutofillClientEfl::ConfirmSaveAddressProfile(
     const AutofillProfile& profile,
     const AutofillProfile* original_profile,
-    AutofillClient::SaveAddressProfilePromptOptions options,
+    bool is_migration_to_account,
     AddressProfileSavePromptCallback callback) {
   NOTIMPLEMENTED();
 }
@@ -469,6 +481,7 @@ url::Origin AutofillClientEfl::GetLastCommittedPrimaryMainFrameOrigin() const {
   return url::Origin();
 }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 void AutofillClientEfl::OpenPromoCodeOfferDetailsURL(const GURL& url) {
   NOTIMPLEMENTED();
 }
@@ -476,6 +489,7 @@ void AutofillClientEfl::OpenPromoCodeOfferDetailsURL(const GURL& url) {
 void AutofillClientEfl::HideTouchToFillCreditCard() {
   NOTIMPLEMENTED();
 }
+#endif
 
 }  // namespace autofill
 
index acc115dffe22fb83a828087a4f733cf574517779..ec1ce22ec684d8d841b3ea8a48a330d609eea781 100644 (file)
@@ -57,7 +57,8 @@ class AutofillClientEfl : public ContentAutofillClient,
   PrefService* GetPrefs() override;
   virtual const PrefService* GetPrefs() const override;
   syncer::SyncService* GetSyncService() override;
-  void ShowAutofillSettings(FillingProduct main_filling_product) override;
+  void ShowAutofillSettings(SuggestionType suggestion_type) override;
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   void ConfirmSaveCreditCardLocally(
       const CreditCard& card,
       SaveCreditCardOptions options,
@@ -69,13 +70,16 @@ class AutofillClientEfl : public ContentAutofillClient,
       UploadSaveCardPromptCallback callback) override;
   void ConfirmCreditCardFillAssist(const CreditCard& card,
                                    base::OnceClosure callback) override;
-  void ShowAutofillSuggestions(
+#endif
+  SuggestionUiSessionId ShowAutofillSuggestions(
       const PopupOpenArgs& open_args,
       base::WeakPtr<AutofillSuggestionDelegate> delegate) override;
   void UpdateAutofillDataListValues(
       base::span<const SelectOption> datalist) override;
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   bool HasCreditCardScanFeature() const override;
   void ScanCreditCard(CreditCardScanCallback callback) override;
+#endif
   bool IsContextSecure() const override;
 
   signin::IdentityManager* GetIdentityManager() override;
@@ -86,6 +90,7 @@ class AutofillClientEfl : public ContentAutofillClient,
 
   void HideAutofillSuggestions(SuggestionHidingReason reason) override;
   bool IsAutocompleteEnabled() const override;
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   void DidFillOrPreviewField(const std::u16string& autofilled_value,
                              const std::u16string& profile_full_name) override;
   void ShowWebauthnOfferDialog(
@@ -94,30 +99,37 @@ class AutofillClientEfl : public ContentAutofillClient,
       WebauthnDialogCallback verify_pending_dialog_callback) override;
   void UpdateWebauthnOfferDialogWithError() override;
   bool CloseWebauthnDialog() override;
+#endif
   void PinAutofillSuggestions() override;
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   void UpdatePopup(const std::vector<Suggestion>& suggestions,
                    FillingProduct main_filling_product,
                    AutofillSuggestionTriggerSource trigger_sources) override;
+#endif
   const GURL& GetLastCommittedPrimaryMainFrameURL() const override;
   const translate::LanguageState* GetLanguageState() override;
   translate::TranslateDriver* GetTranslateDriver() override;
   void ConfirmSaveAddressProfile(
       const AutofillProfile& profile,
       const AutofillProfile* original_profile,
-      AutofillClient::SaveAddressProfilePromptOptions options,
+      bool is_migration_to_account,
       AddressProfileSavePromptCallback callback) override;
   payments::PaymentsAutofillClient* GetPaymentsAutofillClient() override;
   url::Origin GetLastCommittedPrimaryMainFrameOrigin() const override;
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   bool ShowTouchToFillCreditCard(
       base::WeakPtr<TouchToFillDelegate> delegate,
       base::span<const autofill::CreditCard> cards_to_suggest) override {
     return false;
   }
+#endif
   bool IsPasswordManagerEnabled() override { return false; }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   void HideTouchToFillCreditCard() override;
 
   void OpenPromoCodeOfferDetailsURL(const GURL& url) override;
+#endif
 
   // content::WebContentsObserver implementation.
   void PrimaryMainFrameWasResized(bool width_changed) override;
index 8e455efc8d36313e2c867447c2d79f7bc1c10e35..ff8a25e04e36869695575aaeb5b7e2a37cff2826 100644 (file)
@@ -80,8 +80,10 @@ void AutofillPopupViewEfl::Show()
 {
   if (autofill_popup_)
     evas_object_show(autofill_popup_);
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   if (delegate_)
     delegate_->OnSuggestionsShown();
+#endif
 }
 
 void AutofillPopupViewEfl::Hide()
index 12b7b0fd8927dae53cd10f47273cebfc4174535f..10c685336dc4b33cc323683acb044d63adea03ce 100644 (file)
@@ -12,9 +12,6 @@
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/dom_storage_context.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/session_storage_usage_info.h"
 #include "content/public/browser/storage_partition.h"
index 7fcc092a5edf04569ce93408da6a339ce13a0805..784cab5daa8d59fb22846c443b4f245627873ad4 100644 (file)
@@ -11,8 +11,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "components/services/storage/public/cpp/buckets/bucket_locator.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "storage/browser/quota/quota_client_type.h"
 #include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
 #include "url/gurl.h"
index c571c8197c5c9be126f0b2b08b7fd4f7cd0054ff..b441bd8fcb12cfb6d54ac96d1a114c62720affd3 100644 (file)
@@ -158,14 +158,12 @@ NavigationPolicyParams NavigationThrottleEfl::GetNavigationPolicyParams(
   params.httpMethod = handle->IsPost() ? "POST" : "GET";
   params.type = GetNavigationTypeFromPageTransition(
       handle->GetPageTransition(), handle->GetReloadType() != ReloadType::NONE);
-  std::string auth;
-  handle->GetRequestHeaders().GetHeader(net::HttpRequestHeaders::kAuthorization,
-                                        &auth);
-  params.auth = blink::WebString::FromUTF8(auth);
-  std::string cookie;
-  handle->GetRequestHeaders().GetHeader(net::HttpRequestHeaders::kCookie,
-                                        &cookie);
-  params.cookie = cookie;
+  std::optional<std::string> auth = handle->GetRequestHeaders().GetHeader(
+      net::HttpRequestHeaders::kAuthorization);
+  params.auth = blink::WebString::FromUTF8(auth.value());
+  std::optional<std::string> cookie =
+      handle->GetRequestHeaders().GetHeader(net::HttpRequestHeaders::kCookie);
+  params.cookie = cookie.value();
   params.should_replace_current_entry = handle->DidReplaceEntry();
   params.is_main_frame = handle->IsInMainFrame();
   params.is_redirect = is_redirect;
index a8779973e83e9b04d29f8dd49df92c9c202ad89a..916dd4c7f991c3efc128f8e7bf8a79b6523a2a22 100644 (file)
@@ -125,6 +125,7 @@ void ProxyingURLLoaderEfl::SendRawData() {
     size_t write_size = buffer->BytesRemaining();
     DCHECK_GT(write_size, 0);
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
     MojoResult result = producer_handle_->WriteData(buffer->data(), &write_size,
                                                     MOJO_WRITE_DATA_FLAG_NONE);
     if (result == MOJO_RESULT_SHOULD_WAIT) {
@@ -136,6 +137,7 @@ void ProxyingURLLoaderEfl::SendRawData() {
       Finish(net::ERR_FAILED);
       return;
     }
+#endif
 
     buffer->DidConsume(write_size);
     if (!buffer->BytesRemaining())
index cfc92267d2d33583090b9c6108d26ad08d9a9285..943ccb619a60e2c8929190e64410c71e3e280d39 100644 (file)
@@ -25,8 +25,7 @@ class BytesElementReader : public net::UploadBytesElementReader {
  public:
   BytesElementReader(ResourceRequestBody* resource_request_body,
                      const network::DataElementBytes& element)
-      : net::UploadBytesElementReader(element.AsStringPiece().data(),
-                                      element.AsStringPiece().size()),
+      : net::UploadBytesElementReader(element.bytes()),
         resource_request_body_(resource_request_body) {}
 
   ~BytesElementReader() override {}
@@ -63,6 +62,7 @@ class FileElementReader : public net::UploadFileElementReader {
   scoped_refptr<ResourceRequestBody> resource_request_body_;
 };
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 EWebView* GetWebViewFromFrameTreeNodeId(int frame_tree_node_id) {
   auto* web_content =
       content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
@@ -70,6 +70,7 @@ EWebView* GetWebViewFromFrameTreeNodeId(int frame_tree_node_id) {
     return nullptr;
   return web_contents_utils::WebViewFromWebContents(web_content);
 }
+#endif
 
 }  // namespace
 
@@ -143,7 +144,9 @@ void ProxyingURLLoaderFactoryEfl::CreateLoaderAndStart(
     mojo::PendingRemote<network::mojom::URLLoaderClient> client,
     const net::MutableNetworkTrafficAnnotationTag& traffic_annotation) {
   InterceptRequestParams params;
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   params.web_view = GetWebViewFromFrameTreeNodeId(frame_tree_node_id_);
+#endif
   params.url = request.url;
   params.method = request.method;
   params.headers = request.headers;
index 3331fc55162c4d2204971529be1da9bd0d213085..d03976e04c822fa14a43f7a6f68a3c8d9a48b4aa 100644 (file)
@@ -57,14 +57,14 @@ bool NotificationHelper::PersistentNotificationClicked(
     return false;
 
   notification_event_dispatcher_->DispatchNotificationClickEvent(
-      browser_context, std::string(id), GURL(base::StringPiece(origin)),
+      browser_context, std::string(id), GURL(std::string_view(origin)),
       std::optional<int>(), std::optional<std::u16string>(),
       base::BindOnce(OnEventDispatchComplete));
   // TODO: Currently if we click notification in quick panel, it will be
   // deleted automatically by platform. If we can keep the notification
   // after click, we don't need to call |DispatchNotificationCloseEvent| here.
   notification_event_dispatcher_->DispatchNotificationCloseEvent(
-      browser_context, std::string(id), GURL(base::StringPiece(origin)), false,
+      browser_context, std::string(id), GURL(std::string_view(origin)), false,
       base::BindOnce(OnEventDispatchComplete));
   return true;
 }
index 2189274efbdb6ff81e1c98cf029a41852f224e18..03a3e336cf0569d43c77b4206808b56c1ecceacc 100644 (file)
@@ -217,8 +217,8 @@ void PasswordManagerClientEfl::PasswordFormsParsed(
       password_manager_driver_bindings_.GetCurrentTargetFrame();
   std::vector<autofill::FormData> forms = raw_forms;
   for (auto& form : forms) {
-    if (!bad_message::CheckChildProcessSecurityPolicyForURL(
-            rfh, form.url,
+    if (!password_manager::bad_message::CheckChildProcessSecurityPolicyForURL(
+            rfh, form.url(),
             BadMessageReason::CPMD_BAD_ORIGIN_FORMS_PARSED_OBSOLETE)) {
       return;
     }
@@ -235,8 +235,8 @@ void PasswordManagerClientEfl::PasswordFormsRendered(
       password_manager_driver_bindings_.GetCurrentTargetFrame();
   std::vector<autofill::FormData> forms = visible_forms;
   for (auto& form : forms) {
-    if (!bad_message::CheckChildProcessSecurityPolicyForURL(
-            rfh, form.url,
+    if (!password_manager::bad_message::CheckChildProcessSecurityPolicyForURL(
+            rfh, form.url(),
             BadMessageReason::CPMD_BAD_ORIGIN_FORMS_RENDERED_OBSOLETE)) {
       return;
     }
@@ -251,8 +251,8 @@ void PasswordManagerClientEfl::PasswordFormSubmitted(
     const autofill::FormData& password_form) {
   content::RenderFrameHost* rfh =
       password_manager_driver_bindings_.GetCurrentTargetFrame();
-  if (!bad_message::CheckChildProcessSecurityPolicyForURL(
-          rfh, password_form.url,
+  if (!password_manager::bad_message::CheckChildProcessSecurityPolicyForURL(
+          rfh, password_form.url(),
           BadMessageReason::CPMD_BAD_ORIGIN_FORM_SUBMITTED)) {
     return;
   }
@@ -388,6 +388,11 @@ PasswordManagerClientEfl::GetAffiliationService() {
   return nullptr;
 }
 
+void PasswordManagerClientEfl::OpenPasswordDetailsBubble(
+    const password_manager::PasswordForm& form) {
+  NOTIMPLEMENTED();
+}
+
 std::unique_ptr<PasswordCrossDomainConfirmationPopupController>
 PasswordManagerClientEfl::ShowCrossDomainConfirmationPopup(
     const gfx::RectF& element_bounds,
index 54656600c9b17047090c6522970b0e5494f34481..2b4b40380bcf3e64c7755f0de3122b53b634b2c8 100644 (file)
@@ -163,6 +163,9 @@ class PasswordManagerClientEfl
   void CheckSafeBrowsingReputation(const GURL& form_action,
                                    const GURL& frame_url) override;
 
+  void OpenPasswordDetailsBubble(
+      const password_manager::PasswordForm& form) override;
+
   std::unique_ptr<PasswordCrossDomainConfirmationPopupController>
   ShowCrossDomainConfirmationPopup(
       const gfx::RectF& element_bounds,
index dbb80139d5f7fa3c5db8cd2271720168816ce878..d4cbcfee17ff15e3aeff3bad82a086a4b4f5ebca 100644 (file)
@@ -28,8 +28,7 @@ class BrowserURLLoaderThrottleEfl;
 class _Ewk_Policy_Decision;
 
 class PolicyResponseDelegateEfl
-    : public base::RefCountedThreadSafe<PolicyResponseDelegateEfl>,
-      public base::SupportsWeakPtr<PolicyResponseDelegateEfl> {
+    : public base::RefCountedThreadSafe<PolicyResponseDelegateEfl> {
  public:
   PolicyResponseDelegateEfl(const network::ResourceRequest& request,
                             network::mojom::URLResponseHead* response_head,
@@ -45,6 +44,10 @@ class PolicyResponseDelegateEfl
   void IgnoreResponse();
   void ThrottleDestroyed();
 
+  base::WeakPtr<PolicyResponseDelegateEfl> AsWeakPtr() {
+    return weak_ptr_factory_.GetWeakPtr();
+  }
+
  private:
   friend class base::RefCountedThreadSafe<PolicyResponseDelegateEfl>;
 
@@ -58,6 +61,8 @@ class PolicyResponseDelegateEfl
   // It is used to cancel or resume response processing.
   BrowserURLLoaderThrottleEfl* url_loader_throttle_ = nullptr;
   bool deferred_ = false;
+
+  base::WeakPtrFactory<PolicyResponseDelegateEfl> weak_ptr_factory_{this};
 };
 
 #endif /* POLICY_RESPONSE_DELEGATE_EFL_H_ */
index 9a72d7ec7803928fb7f31b4a5a682016a2ed7c86..8ab69e07e0872faf223758b0e2868ac123c2e375 100644 (file)
@@ -5,9 +5,6 @@
 #include "browser/tizen_extensible_host.h"
 
 #include "common/render_messages_ewk.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 
 // static
@@ -47,6 +44,7 @@ void TizenExtensibleHost::Initialize() {
 #endif
 }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 void TizenExtensibleHost::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
@@ -72,6 +70,7 @@ void TizenExtensibleHost::Observe(int type,
   }
 #endif
 }
+#endif
 
 void TizenExtensibleHost::UpdateTizenExtensible(int render_process_id) {
   DCHECK(render_process_id);
index b4e8387126e79e3e90bcd8f72c791d13a8a3ec59..b90c8bfbc219ef70ce3024ee69a1ec426b0cd2cd 100644 (file)
 
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "public/ewk_context.h"
 
-class TizenExtensibleHost : public content::NotificationObserver {
+class TizenExtensibleHost {
  public:
   static TizenExtensibleHost* GetInstance();
   void Initialize();
 
-  // content::NotificationObserver implementation:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
   void UpdateTizenExtensible(int render_process_id);
 
   // Tizen Extensible API
@@ -32,12 +26,11 @@ class TizenExtensibleHost : public content::NotificationObserver {
 
  private:
   TizenExtensibleHost();
-  ~TizenExtensibleHost() override;
+  ~TizenExtensibleHost();
 
   TizenExtensibleHost(const TizenExtensibleHost&) = delete;
   TizenExtensibleHost& operator=(const TizenExtensibleHost&) = delete;
 
-  content::NotificationRegistrar registrar_;
   std::set<int> renderers_;
   std::map<std::string, bool> extensible_api_table_;
   friend struct base::DefaultSingletonTraits<TizenExtensibleHost>;
index 06a1461447c413fe3ea334c4f7f6be581b5aa19b..bdd1878f8fe01fbb12e88eb468f6421a80b426ba 100644 (file)
@@ -8,9 +8,6 @@
 #include "base/system/sys_info.h"
 #include "common/render_messages_ewk.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 
 WebCacheManagerEfl::WebCacheManagerEfl(content::BrowserContext* browser_context)
@@ -26,6 +23,7 @@ WebCacheManagerEfl::WebCacheManagerEfl(content::BrowserContext* browser_context)
 
 WebCacheManagerEfl::~WebCacheManagerEfl() {}
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 void WebCacheManagerEfl::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
@@ -53,6 +51,7 @@ void WebCacheManagerEfl::Observe(int type,
   }
 #endif
 }
+#endif
 
 void WebCacheManagerEfl::ClearCache() {
   for (int id : renderers_) {
index 23ca48bd3f0fb928f92d3c0d24aaefd3b9c94d93..90934e82db6f9578a6c92809f38618981b3ecc0c 100644 (file)
@@ -9,15 +9,13 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "public/ewk_context.h"
 
 namespace content {
 class BrowserContext;
 }
 
-class WebCacheManagerEfl : public content::NotificationObserver {
+class WebCacheManagerEfl {
  public:
   explicit WebCacheManagerEfl(content::BrowserContext* browser_context);
   virtual ~WebCacheManagerEfl();
@@ -25,10 +23,6 @@ class WebCacheManagerEfl : public content::NotificationObserver {
   WebCacheManagerEfl(const WebCacheManagerEfl&) = delete;
   WebCacheManagerEfl& operator=(const WebCacheManagerEfl&) = delete;
 
-  // content::NotificationObserver implementation:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
   void ClearCache();
   void SetCacheModel(Ewk_Cache_Model model);
   Ewk_Cache_Model GetCacheModel() const { return cache_model_; }
@@ -38,7 +32,6 @@ class WebCacheManagerEfl : public content::NotificationObserver {
   int64_t GetCacheTotalCapacity(Ewk_Cache_Model);
   void SetRenderProcessCacheModel(Ewk_Cache_Model model, int render_process_id);
 
-  content::NotificationRegistrar registrar_;
   std::set<int> renderers_;
   content::BrowserContext* browser_context_;
   Ewk_Cache_Model cache_model_;
index 77f3994101e51ede57cf63924ff39d53f13431ae..dc8dd3c2b9c4590cd09d1f3df72f9ce3cf622cbe 100644 (file)
@@ -8,10 +8,6 @@
 #include "common/render_messages_ewk.h"
 #include "common/web_contents_utils.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "eweb_view.h"
@@ -27,8 +23,7 @@ namespace {
 static const uint32_t kFilteredMessageClasses[] = {EwkMsgStart};
 }
 
-class WebViewBrowserMessageFilterPrivate
-    : public content::NotificationObserver {
+class WebViewBrowserMessageFilterPrivate {
  public:
   WebViewBrowserMessageFilterPrivate(WebContents* web_contents) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -130,17 +125,8 @@ class WebViewBrowserMessageFilterPrivate
                                                        currentNodeIndex);
   }
 
-  void Observe(int type, const content::NotificationSource& source,
-      const content::NotificationDetails& details) override {
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
-    DCHECK_EQ(content::NOTIFICATION_WEB_CONTENTS_DESTROYED, type);
-#endif
-    web_view_ = NULL;
-  }
-
  private:
   EWebView* web_view_;
-  content::NotificationRegistrar registrar_;
 };
 
 WebViewBrowserMessageFilter::WebViewBrowserMessageFilter(
index b498ac9b10866748343d9dbad0b146ac1121c056..115126c392035839b879903ec4f1d2b2ee7be185 100644 (file)
@@ -14,9 +14,6 @@
 #include "components/webdata/common/web_database_service.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
 
 using base::Time;
 using content::BrowserThread;
index 589ae9080e74195fc5a32f8160398929e3a0aece..ac73d44fde2406c31a8d6b54e8e82356c602416c 100644 (file)
@@ -64,10 +64,12 @@ WebDataServiceWrapperEfl::WebDataServiceWrapperEfl() {
   web_database_->AddTable(std::make_unique<autofill::AutocompleteTable>());
   web_database_->AddTable(std::make_unique<autofill::AddressAutofillTable>());
   web_database_->AddTable(std::make_unique<autofill::PaymentsAutofillTable>());
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   web_database_->LoadDatabase();
+#endif
 
   autofill_web_data_ =
-      new AutofillWebDataService(web_database_, ui_task_runner, db_task_runner);
+      new AutofillWebDataService(web_database_, ui_task_runner);
   autofill_web_data_->Init(base::BindOnce(&ProfileErrorCallback));
 
   autofill_web_data_->GetAutofillBackend(
index 079753743ba147e08eca99fce0b80d60c76964a4..5559e076ea99df29008cecd7d8c1a03a9ad70ade 100644 (file)
@@ -34,7 +34,7 @@ std::u16string ContentClientEfl::GetLocalizedString(int message_id) {
   return l10n_util::GetStringUTF16(message_id);
 }
 
-base::StringPiece ContentClientEfl::GetDataResource(
+std::string_view ContentClientEfl::GetDataResource(
     int resource_id,
     ui::ResourceScaleFactor scale_factor) {
   // TODO(boliu): Used only by WebKit, so only bundle those resources for
index a1f0750e47a5db0b37609446ac909c50fe0ac61c..135016f2930c1960738b25482add5673238c5af5 100644 (file)
@@ -17,7 +17,7 @@ class ContentClientEfl : public content::ContentClient {
  public:
   // ContentClient implementation.
   std::u16string GetLocalizedString(int message_id) override;
-  base::StringPiece GetDataResource(
+  std::string_view GetDataResource(
       int resource_id,
       ui::ResourceScaleFactor scale_factor) override;
   base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
index 28500446d47f25590564fb0b7e577c20f408e7a6..9603b3623e25796b4696a717494b983efd4a523e 100644 (file)
@@ -636,12 +636,14 @@ void ContentBrowserClientEfl::WillCreateURLLoaderFactory(
     std::tie(proxied_receiver, target_factory_remote) =
         factory_builder.Append();
   }
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   GetIOThreadTaskRunner({})->PostTask(
       FROM_HERE,
       base::BindOnce(&ProxyingURLLoaderFactoryEfl::CreateProxy,
                      frame->GetFrameTreeNodeId(), resource_context_efl,
                      std::move(proxied_receiver),
                      std::move(target_factory_remote)));
+#endif
 }
 
 std::vector<std::unique_ptr<blink::URLLoaderThrottle>>
@@ -650,7 +652,7 @@ ContentBrowserClientEfl::CreateURLLoaderThrottles(
     content::BrowserContext* browser_context,
     const base::RepeatingCallback<content::WebContents*()>& wc_getter,
     content::NavigationUIData* navigation_ui_data,
-    int frame_tree_node_id,
+    FrameTreeNodeId frame_tree_node_id,
     std::optional<int64_t> navigation_id) {
   std::vector<std::unique_ptr<blink::URLLoaderThrottle>> result;
 
index c48d37df973b770d220fb4f49de6e567952648c0..271eb62dd3472da8beed52d110de42705a9f7d3f 100644 (file)
@@ -158,7 +158,7 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
       content::BrowserContext* browser_context,
       const base::RepeatingCallback<content::WebContents*()>& wc_getter,
       content::NavigationUIData* navigation_ui_data,
-      int frame_tree_node_id,
+      FrameTreeNodeId frame_tree_node_id,
       std::optional<int64_t> navigation_id) override;
   std::string GetAcceptLangs(BrowserContext* context) override;
 
index 7c243196ac9c51eb63c11cfd22e537e6caef777b..c2e24799e9c6a137ecd8d53fdb434fc5a15b8e2a 100644 (file)
@@ -399,7 +399,7 @@ void ContextMenuControllerEfl::OpenURL(
       url,
       content::Referrer(web_contents_.GetVisibleURL(),
                         network::mojom::ReferrerPolicy::kAlways),
-      -1, /* -1 to indicate the main frame */
+      FrameTreeNodeId(),  // FIXME: m130 bringup
       disposition, ui::PAGE_TRANSITION_LINK, false);
 
   web_contents_.GetDelegate()->OpenURLFromTab(
index 1a19481454f83724b54d5de908f6eb69d24e0888..5905512ea95cd703694554ada017ca99528a5d69 100644 (file)
@@ -936,7 +936,7 @@ void EWebContext::SetDefaultZoomFactor(double zoom_factor) {
       content::HostZoomMap::GetDefaultForBrowserContext(browser_context_.get());
   if (host_zoom_map) {
     host_zoom_map->SetDefaultZoomLevel(
-        blink::PageZoomFactorToZoomLevel(zoom_factor));
+        blink::ZoomFactorToZoomLevel(zoom_factor));
   }
 }
 
@@ -944,8 +944,7 @@ double EWebContext::GetDefaultZoomFactor() const {
   content::HostZoomMap* host_zoom_map =
       content::HostZoomMap::GetDefaultForBrowserContext(browser_context_.get());
   if (host_zoom_map) {
-    return blink::PageZoomLevelToZoomFactor(
-        host_zoom_map->GetDefaultZoomLevel());
+    return blink::ZoomLevelToZoomFactor(host_zoom_map->GetDefaultZoomLevel());
   }
 
   return -1.0;
index f91bac08787218d98db740bccc593cda9f71bc16..2d756743877a202f5888e44c10181817cebc5d7d 100644 (file)
@@ -34,7 +34,6 @@
 #include "components/sessions/core/serialized_navigation_entry.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
-#include "content/browser/renderer_host/ui_events_helper.h"
 #include "content/browser/web_contents/web_contents_impl_efl.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/browser/web_contents/web_contents_view_aura.h"
@@ -797,13 +796,13 @@ void EWebView::SetTextZoomFactor(double text_zoom_factor) {
 }
 
 double EWebView::GetPageZoomFactor() const {
-  return blink::PageZoomLevelToZoomFactor(
+  return blink::ZoomLevelToZoomFactor(
       content::HostZoomMap::GetZoomLevel(web_contents_.get()));
 }
 
 void EWebView::SetPageZoomFactor(double page_zoom_factor) {
   content::HostZoomMap::SetZoomLevel(
-      web_contents_.get(), blink::PageZoomFactorToZoomLevel(page_zoom_factor));
+      web_contents_.get(), blink::ZoomFactorToZoomLevel(page_zoom_factor));
 }
 
 void EWebView::ExecuteEditCommand(const char* command, const char* value) {
@@ -1105,16 +1104,20 @@ bool EWebView::ExecuteJavaScript(const char* script,
     // In M47, it isn't possible anymore to execute javascript in the generic
     // case. We need to call ExecuteJavaScriptForTests to keep the behaviour
     // unchanged @see https://codereview.chromium.org/1123783002
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
     render_frame_host->ExecuteJavaScriptWithUserGestureForTests(
         js_script, std::move(js_callback));
+#endif
   } else {
     // We use ExecuteJavaScriptWithUserGestureForTests instead of
     // ExecuteJavaScript because
     // ExecuteJavaScriptWithUserGestureForTests sets user_gesture to true. This
     // was the
     // behaviour is m34, and we want to keep it that way.
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
     render_frame_host->ExecuteJavaScriptWithUserGestureForTests(
         js_script, base::NullCallback());
+#endif
   }
 
   return true;
@@ -1273,7 +1276,6 @@ void EWebView::LoadData(const char* data,
   NavigationController::LoadURLParams data_params(GURL(url_str.c_str()));
 
   data_params.base_url_for_data_url = GURL(base_uri);
-  data_params.virtual_url_for_data_url = GURL(unreachable_uri);
 
   data_params.load_type = NavigationController::LOAD_TYPE_DATA;
   data_params.should_replace_current_entry = should_replace_current_entry;
@@ -1502,7 +1504,7 @@ void EWebView::Find(const char* text, Ewk_Find_Options ewk_find_options) {
       !(ewk_find_options & EWK_FIND_OPTIONS_CASE_INSENSITIVE);
 
   web_contents_->Find(current_find_request_id_, find_text,
-                      std::move(find_options));
+                      std::move(find_options), false /* skip_delay */);
 }
 
 void EWebView::SetScale(double scale_factor) {
@@ -2921,8 +2923,8 @@ void EWebView::UrlRequestSet(
       if (t->key) {
         const char* value_str =
             t->data ? static_cast<const char*>(t->data) : "";
-        base::StringPiece name = static_cast<const char*>(t->key);
-        base::StringPiece value = value_str;
+        std::string_view name = static_cast<const char*>(t->key);
+        std::string_view value = value_str;
         header.SetHeader(name, value);
         // net::HttpRequestHeaders.ToString() returns string with newline
         params.extra_headers += header.ToString();
index 5f8381757d2156769de580a54e804d5d73eec990..06166b94faa3f5cd028fc41075e3b375ee7fbe6e 100644 (file)
@@ -5,26 +5,27 @@
 #ifndef EWEB_VIEW_H
 #define EWEB_VIEW_H
 
-#include <map>
-#include <string>
 #include <Evas.h>
 #include <locale.h>
+
+#include <map>
+#include <string>
 #include <vector>
 
 #include "base/containers/id_map.h"
 #include "base/functional/callback.h"
 #include "base/synchronization/waitable_event.h"
 #include "browser/input_picker/input_picker.h"
+#include "components/input/event_with_latency_info.h"
+#include "components/input/input_event_ack_state.h"
 #include "content/browser/select_picker/select_picker_base.h"
 #include "content/browser/selection/selection_controller_efl.h"
 #include "content/browser/web_contents/web_contents_view_aura.h"
 #include "content/browser/web_contents/web_contents_view_aura_helper_efl.h"
-#include "content/common/input/event_with_latency_info.h"
 #include "content/public/browser/context_menu_params.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/webview_delegate.h"
-#include "content/public/common/input_event_ack_state.h"
 #include "content_browser_client_efl.h"
 #include "context_menu_controller_efl.h"
 #include "eweb_context.h"
index a71e1682c84265ca3c2dd4651275f6b284d26357..543e9177ca1940041a013231d821c7c45b3da516 100644 (file)
@@ -76,8 +76,10 @@ EwkGlobalData::~EwkGlobalData() {
 
   // We need to pretend that message loop was stopped so chromium unwinds
   // correctly
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   if (base::RunLoop::IsRunningOnCurrentThread())
     base::RunLoop().QuitWhenIdleClosure();
+#endif
   // Since we forcibly shutdown our UI message loop, it is possible
   // that important pending Tasks are simply not executed.
   // Among these, the destruction of RenderProcessHostImpl class
index 9b24f0c44f82c43423544db4f3f8b114aa0522b6..05993f10ca2ae8ab944701b566e0054082cb0e11 100644 (file)
@@ -313,7 +313,7 @@ PermissionControllerDelegateEfl::SubscribeToPermissionStatusChange(
 }
 
 void PermissionControllerDelegateEfl::UnsubscribeFromPermissionStatusChange(
-    PermissionControllerDelegate::SubscriptionId subscription_id) {
+    content::PermissionController::SubscriptionId subscription_id) {
   NOTIMPLEMENTED();
 }
 
index 72288d64bf80df4fcebd148f2c609cf2ba9340d3..b77948f6ed4be2f42dab0bce23020c318fc46059 100644 (file)
@@ -77,11 +77,10 @@ class CONTENT_EXPORT PermissionControllerDelegateEfl : public PermissionControll
       RenderFrameHost* render_frame_host,
       const GURL& embedding_origin,
       bool should_include_device_status,
-      base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback)
-      override;
+      base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback);
 
   void UnsubscribeFromPermissionStatusChange(
-      PermissionControllerDelegate::SubscriptionId subscription_id) override;
+      content::PermissionController::SubscriptionId subscription_id) override;
 
  private:
   struct PendingRequest;
index b5725ff76bc6aa2a849ee2fcbd3bebaaaa5ee566..99bc583929c2f1b7656ce5cae6d2cdbf4427953c 100644 (file)
@@ -44,7 +44,7 @@ std::string UnsignedToGUID(unsigned id) {
 }
 
 bool IsValidEwkGUID(const std::string& guid) {
-  if (!base::Uuid::ParseCaseInsensitive(base::StringPiece(guid)).is_valid()) {
+  if (!base::Uuid::ParseCaseInsensitive(std::string_view(guid)).is_valid()) {
     return false;
   }
   if (guid.compare(0, kEwkGuidStartString.length(), kEwkGuidStartString))
@@ -98,7 +98,7 @@ autofill::AutofillProfile to_Autofill_Profile(
     const Ewk_Autofill_Profile* oldStyleProfile) {
   std::string locale = EWebView::GetPlatformLocale();
   autofill::AutofillProfile ret(
-      locale, autofill::AutofillProfile::Source::kLocalOrSyncable,
+      locale, autofill::AutofillProfile::RecordType::kLocalOrSyncable,
       autofill::i18n_model_definition::kLegacyHierarchyCountryCode);
   if (!oldStyleProfile)
     return ret;
@@ -212,11 +212,11 @@ EwkContextFormAutofillProfileManager::priv_form_autofill_profile_get_all(
 
   Eina_List* list = nullptr;
 
-  std::vector<autofill::AutofillProfile*> dataVector =
+  std::vector<const autofill::AutofillProfile*> dataVector =
       manager->address_data_manager().GetProfiles();
 
   for (unsigned i = 0; i < dataVector.size(); ++i) {
-    autofill::AutofillProfile* profile = dataVector[i];
+    const autofill::AutofillProfile* profile = dataVector[i];
     if (profile) {
       Ewk_Autofill_Profile* p = to_Ewk_Autofill_Profile(*profile);
       if (p)
@@ -237,7 +237,7 @@ EwkContextFormAutofillProfileManager::priv_form_autofill_profile_get(
 
   Ewk_Autofill_Profile* ret = nullptr;
 
-  autofill::AutofillProfile* profile =
+  const autofill::AutofillProfile* profile =
       manager->address_data_manager().GetProfileByGUID(UnsignedToGUID(id));
 
   if (profile)
@@ -255,7 +255,7 @@ Eina_Bool EwkContextFormAutofillProfileManager::priv_form_autofill_profile_set(
       PersonalDataManagerForEWKContext(ewk_context);
   DCHECK(manager);
 
-  autofill::AutofillProfile* profile =
+  const autofill::AutofillProfile* profile =
       manager->address_data_manager().GetProfileByGUID(UnsignedToGUID(id));
   if (profile)
     manager->address_data_manager().UpdateProfile(
index 34861df27d0583b0ebb29d86aee34bfe25c04306..1f8bfc4175cee9f88b7c1eb83b17c4637e4463c3 100644 (file)
@@ -65,9 +65,9 @@ bool Ewk_Notification::SaveAsPng(const char* path) const {
   std::vector<unsigned char> png_data;
   if (gfx::PNGCodec::EncodeBGRASkBitmap(icon_, false, &png_data)) {
     if (base::WriteFile(base::FilePath(path),
-                        reinterpret_cast<char*>(png_data.data()),
-                        png_data.size()) != -1)
+                        reinterpret_cast<char*>(png_data.data())) != -1) {
       return true;
+    }
   }
   return false;
 }
index 93e79fcf20b798afd81b6bab9c61dd5c5dbe4699..7593b7802f1d73f9b230ab615adae1cd58112b54 100644 (file)
@@ -26,7 +26,9 @@ void FreeStringShare(void* data) {
 _Ewk_Policy_Decision::_Ewk_Policy_Decision(const PolicyResponseParams& params,
                                            PolicyResponseDelegateEfl* delegate)
     : web_view_(NULL),
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
       policy_response_delegate_(AsWeakPtr(delegate)),
+#endif
       frame_(new _Ewk_Frame(params.is_main_frame)),
       http_body_(params.post_data),
       response_mime_(params.mime_type),
@@ -112,11 +114,15 @@ _Ewk_Policy_Decision::~_Ewk_Policy_Decision() {
 }
 
 void _Ewk_Policy_Decision::Use() {
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   DCHECK(policy_response_delegate_.get());
+#endif
   is_decided_ = true;
   switch (type_) {
     case POLICY_RESPONSE:
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
       policy_response_delegate_->UseResponse();
+#endif
       break;
     case POLICY_NAVIGATION:
       navigation_policy_handler_->SetDecision(
@@ -137,11 +143,15 @@ void _Ewk_Policy_Decision::Use() {
 }
 
 void _Ewk_Policy_Decision::Ignore() {
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   DCHECK(policy_response_delegate_.get());
+#endif
   is_decided_ = true;
   switch (type_) {
     case _Ewk_Policy_Decision::POLICY_RESPONSE:
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
       policy_response_delegate_->IgnoreResponse();
+#endif
       break;
     case _Ewk_Policy_Decision::POLICY_NAVIGATION:
       navigation_policy_handler_->SetDecision(
index ac7df3ecd582bc9db4758bdd90d3583ce9a6c833..84675048906cd68835f7cf9c4c638015bb877f14 100644 (file)
@@ -96,7 +96,9 @@ class _Ewk_Policy_Decision {
   };
 
   EWebView* web_view_;
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   base::WeakPtr<PolicyResponseDelegateEfl> policy_response_delegate_;
+#endif
   std::unique_ptr<NavigationPolicyHandlerEfl> navigation_policy_handler_;
   std::unique_ptr<_Ewk_Frame> frame_;
   std::string cookie_;
index f37475f5b148a7b01baa232c9d468f5760d4a1a9..2750f88e17541d21537168dd87a360fbbd4ce5ff 100644 (file)
@@ -30,9 +30,7 @@ class GinNativeBridgeObject;
 // cleared. These objects remain bound until the window object is cleared
 // again.
 
-class GinNativeBridgeDispatcher
-    : public base::SupportsWeakPtr<GinNativeBridgeDispatcher>,
-      public RenderFrameObserver {
+class GinNativeBridgeDispatcher : public RenderFrameObserver {
  public:
   // GinNativeBridgeObjects are managed by gin. An object gets destroyed
   // when it is no more referenced from JS. As GinNativeBridgeObjects reports
@@ -62,6 +60,10 @@ class GinNativeBridgeDispatcher
       GinNativeBridgeError* error);
   GinNativeBridgeObject* GetObject(ObjectID object_id);
 
+  base::WeakPtr<GinNativeBridgeDispatcher> AsWeakPtr() {
+    return weak_ptr_factory_.GetWeakPtr();
+  }
+
  private:
   void OnAddNamedObject(const std::string& name, ObjectID object_id);
   void OnRemoveNamedObject(const std::string& name);
@@ -70,6 +72,8 @@ class GinNativeBridgeDispatcher
   NamedObjectMap named_objects_;
   ObjectMap objects_;
   bool inside_did_clear_window_object_;
+
+  base::WeakPtrFactory<GinNativeBridgeDispatcher> weak_ptr_factory_{this};
 };
 
 }  // namespace content
index 229112d25badb1360564763bf29cddaa20ded60a..a4e5b6a58f89a7d835c2b3f1ef5448c2d80548b1 100644 (file)
@@ -37,7 +37,7 @@ class HoleLayerImpl : public LayerImpl {
                    AppendQuadsData* append_quads_data) override;
 
  private:
-  const char* LayerTypeAsString() const override { return "cc::HoleLayerImpl"; }
+  const char* LayerTypeAsString() const { return "cc::HoleLayerImpl"; }
 };
 
 const int kSolidQuadTileSize = 256;
index 0c3406d83ebd4204272aac5c3f4e347cae3560f0..7e85d526bf56f6cfb756a70bf21bb36e23a79094 100644 (file)
@@ -69,7 +69,9 @@ void RenderThreadObserverEfl::OnClearCache()
 }
 
 void RenderThreadObserverEfl::OnSetCache(int64_t cache_total_capacity) {
+#if !defined(EWK_BRINGUP)  // FIXME: M130 bringup
   WebCache::SetCapacity(static_cast<size_t>(cache_total_capacity));
+#endif
 }
 
 void RenderThreadObserverEfl::OnSetExtensibleAPI(const std::string& api_name,
index a0dc4593c6791e97de19369380ea3793a286294f..30c3ceac617d8cfb888b0197950e53a81cd24dc2 100644 (file)
@@ -257,6 +257,7 @@ void WebContentsDelegateEfl::NavigationStateChanged(
   }
 }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
 void WebContentsDelegateEfl::AddNewContents(
     WebContents* source,
     std::unique_ptr<WebContents> new_contents,
@@ -277,6 +278,7 @@ void WebContentsDelegateEfl::AddNewContents(
   // WebContents here.
   std::ignore = new_contents.release();
 }
+#endif
 
 bool WebContentsDelegateEfl::ShouldCreateWebContents(
     WebContents* web_contents,
@@ -702,9 +704,11 @@ void WebContentsDelegateEfl::RequestManifestInfo(
     return;
   }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   manifest_manager_host->GetManifest(
       base::BindOnce(&WebContentsDelegateEfl::OnDidGetManifest,
                      base::Unretained(this), callback, user_data));
+#endif
 }
 
 void WebContentsDelegateEfl::OnDidGetManifest(
index f6c706d823ddc5ab14d23c0fc342981c43a2e312..5a6b0f3fb3b00ee6c54d7082bff22f9a7c1180a9 100644 (file)
@@ -37,6 +37,7 @@ class WebContentsDelegateEfl : public WebContentsDelegate {
   void NavigationStateChanged(WebContents* source,
                               InvalidateTypes changed_flags) override;
 
+#if !defined(EWK_BRINGUP)  // FIXME: m130 bringup
   void AddNewContents(WebContents* source,
                       std::unique_ptr<WebContents> new_contents,
                       const GURL& target_url,
@@ -44,6 +45,7 @@ class WebContentsDelegateEfl : public WebContentsDelegate {
                       const blink::mojom::WindowFeatures& window_features,
                       bool user_gesture,
                       bool* was_blocked) override;
+#endif
   bool ShouldCreateWebContents(
       WebContents* web_contents,
       RenderFrameHost* opener,
index 9ac352544f315bde36baf72bebe5f7d2ad62fefe..c8ba4c7ed137e8aef49d619708c5ad0427813cbf 100755 (executable)
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+#!/usr/bin/env python3
+# Copyright 2012 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -9,31 +9,27 @@
 It can also be run stand-alone as a convenient way of installing a well-tested
 near-tip-of-tree clang version:
 
-  $ curl -s https://raw.githubusercontent.com/chromium/chromium/main/tools/clang/scripts/update.py | python - --output-dir=/tmp/clang
+  $ curl -s https://raw.githubusercontent.com/chromium/chromium/main/tools/clang/scripts/update.py | python3 - --output-dir=/tmp/clang
 
 (Note that the output dir may be deleted and re-created if it exists.)
 """
 
-from __future__ import division
-from __future__ import print_function
+import sys
+assert sys.version_info >= (3, 0), 'This script requires Python 3.'
+
 import argparse
 import glob
 import os
 import platform
 import shutil
 import stat
-import sys
 import tarfile
 import tempfile
 import time
-
-try:
-  from urllib2 import HTTPError, URLError, urlopen
-except ImportError:  # For Py3 compatibility
-  from urllib.error import HTTPError, URLError
-  from urllib.request import urlopen
-
+import urllib.request
+import urllib.error
 import zipfile
+import zlib
 
 
 # Do NOT CHANGE this if you don't know what you're doing -- see
@@ -107,30 +103,51 @@ def DownloadUrl(url, output_file):
     try:
       sys.stdout.write(f'Downloading {url} ')
       sys.stdout.flush()
-      response = urlopen(url)
-      total_size = int(response.info().get('Content-Length').strip())
+      request = urllib.request.Request(url)
+      request.add_header('Accept-Encoding', 'gzip')
+      response = urllib.request.urlopen(request)
+      total_size = None
+      if 'Content-Length' in response.headers:
+        total_size = int(response.headers['Content-Length'].strip())
+
+      is_gzipped = response.headers.get('Content-Encoding',
+                                        '').strip() == 'gzip'
+      if is_gzipped:
+        gzip_decode = zlib.decompressobj(zlib.MAX_WBITS + 16)
+
       bytes_done = 0
       dots_printed = 0
       while True:
         chunk = response.read(CHUNK_SIZE)
         if not chunk:
           break
-        output_file.write(chunk)
         bytes_done += len(chunk)
-        num_dots = TOTAL_DOTS * bytes_done // total_size
-        sys.stdout.write('.' * (num_dots - dots_printed))
-        sys.stdout.flush()
-        dots_printed = num_dots
-      if bytes_done != total_size:
-        raise URLError("only got %d of %d bytes" % (bytes_done, total_size))
+
+        if is_gzipped:
+          chunk = gzip_decode.decompress(chunk)
+        output_file.write(chunk)
+
+        if total_size is not None:
+          num_dots = TOTAL_DOTS * bytes_done // total_size
+          sys.stdout.write('.' * (num_dots - dots_printed))
+          sys.stdout.flush()
+          dots_printed = num_dots
+      if total_size is not None and bytes_done != total_size:
+        raise urllib.error.URLError(
+            f'only got {bytes_done} of {total_size} bytes')
+      if is_gzipped:
+        output_file.write(gzip_decode.flush())
       print(' Done.')
       return
-    except URLError as e:
+    except (ConnectionError, urllib.error.URLError) as e:
       sys.stdout.write('\n')
       print(e)
-      if num_retries == 0 or isinstance(e, HTTPError) and e.code == 404:
+      if num_retries == 0 or isinstance(
+          e, urllib.error.HTTPError) and e.code == 404:
         raise e
       num_retries -= 1
+      output_file.seek(0)
+      output_file.truncate()
       print(f'Retrying in {retry_wait_s} s ...')
       sys.stdout.flush()
       time.sleep(retry_wait_s)
@@ -154,7 +171,7 @@ def DownloadAndUnpack(url, output_dir, path_prefixes=None, is_known_zip=False):
       assert path_prefixes is None
       zipfile.ZipFile(f).extractall(path=output_dir)
     else:
-      t = tarfile.open(mode='r:gz', fileobj=f)
+      t = tarfile.open(mode='r:*', fileobj=f)
       members = None
       if path_prefixes is not None:
         members = [m for m in t.getmembers()
@@ -172,12 +189,15 @@ def GetPlatformUrlPrefix(host_os):
   return CDS_URL + '/' + _HOST_OS_URL_MAP[host_os] + '/'
 
 
-def DownloadAndUnpackPackage(package_file, output_dir, host_os):
-  cds_file = "%s-%s.tgz" % (package_file, PACKAGE_VERSION)
+def DownloadAndUnpackPackage(package_file,
+                             output_dir,
+                             host_os,
+                             version=PACKAGE_VERSION):
+  cds_file = "%s-%s.tar.xz" % (package_file, version)
   cds_full_url = GetPlatformUrlPrefix(host_os) + cds_file
   try:
     DownloadAndUnpack(cds_full_url, output_dir)
-  except URLError:
+  except urllib.error.URLError:
     print('Failed to download prebuilt clang package %s' % cds_file)
     print('Use build.py if you want to build locally.')
     print('Exiting.')
@@ -219,17 +239,13 @@ def UpdatePackage(package_name, host_os, dir=LLVM_BUILD_DIR):
   if package_name == 'clang':
     stamp_file = STAMP_FILE
     package_file = 'clang'
-  elif package_name == 'clang-tidy':
-    package_file = 'clang-tidy'
-  elif package_name == 'objdump':
-    package_file = 'llvmobjdump'
-  elif package_name == 'translation_unit':
-    package_file = 'translation_unit'
   elif package_name == 'coverage_tools':
     stamp_file = os.path.join(dir, 'cr_coverage_revision')
     package_file = 'llvm-code-coverage'
-  elif package_name == 'libclang':
-    package_file = 'libclang'
+  elif package_name == 'objdump':
+    package_file = 'llvmobjdump'
+  elif package_name in ['clang-tidy', 'clangd', 'libclang', 'translation_unit']:
+    package_file = package_name
   else:
     print('Unknown package: "%s".' % package_name)
     return 1
@@ -280,7 +296,7 @@ def UpdatePackage(package_name, host_os, dir=LLVM_BUILD_DIR):
   return 0
 
 
-def main():
+def GetDefaultHostOs():
   _PLATFORM_HOST_OS_MAP = {
       'darwin': 'mac',
       'cygwin': 'win',
@@ -290,7 +306,10 @@ def main():
   default_host_os = _PLATFORM_HOST_OS_MAP.get(sys.platform, sys.platform)
   if default_host_os == 'mac' and platform.machine() == 'arm64':
     default_host_os = 'mac-arm64'
+  return default_host_os
+
 
+def main():
   parser = argparse.ArgumentParser(description='Update clang.')
   parser.add_argument('--output-dir',
                       help='Where to extract the package.')
@@ -298,9 +317,9 @@ def main():
                       help='What package to update (default: clang)',
                       default='clang')
   parser.add_argument('--host-os',
-                      help='Which host OS to download for (default: %s)' %
-                      default_host_os,
-                      default=default_host_os,
+                      help=('Which host OS to download for '
+                            '(default: %(default)s)'),
+                      default=GetDefaultHostOs(),
                       choices=('linux', 'mac', 'mac-arm64', 'win'))
   parser.add_argument('--print-revision', action='store_true',
                       help='Print current clang revision and exit.')
@@ -338,6 +357,13 @@ def main():
       print(force_head_revision)
       return 0
 
+    stamp_version = ReadStampFile(STAMP_FILE).partition(',')[0]
+    if PACKAGE_VERSION != stamp_version:
+      print('The expected clang version is %s but the actual version is %s' %
+            (PACKAGE_VERSION, stamp_version))
+      print('Did you run "gclient sync"?')
+      return 1
+
     print(PACKAGE_VERSION)
     return 0
 
@@ -345,12 +371,6 @@ def main():
     print('--llvm-force-head-revision can only be used for --print-revision')
     return 1
 
-  output_dir = LLVM_BUILD_DIR
-  if args.output_dir:
-    global STAMP_FILE
-    output_dir = os.path.abspath(args.output_dir)
-    STAMP_FILE = os.path.join(output_dir, 'cr_build_revision')
-
   return UpdatePackage(args.package, args.host_os, output_dir)
 
 
index 157c7a1c7653091233637e007580d99e1be8f722..eaf7fc0418d6e73e1f48c339b8932ff19c3f80a9 100644 (file)
@@ -40,7 +40,7 @@ void ApppendEventDetails(const WebKeyboardEvent& event, std::string* result) {
                 event.windows_key_code, event.native_key_code,
                 event.is_system_key,
                 reinterpret_cast<const char*>(event.text.data()),
-                reinterpret_cast<const char*>(event.unmodified_text.data());
+                reinterpret_cast<const char*>(event.unmodified_text.data()));
 #endif
 }
 
index 76560d9da4dddc1094db74cb1f58249f8a4490a4..437556d5f78b7decca471100b0149690f88652a5 100644 (file)
 #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);                     \
+#define WRITE_BARRIER(object, offset, value)                          \
+  do {                                                                \
+    DCHECK_NOT_NULL(GetHeapFromWritableObject(object));               \
+    static_assert(kTaggedCanConvertToRawObjects);                     \
+    WriteBarrier::ForValue(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);                              \
+#define WEAK_WRITE_BARRIER(object, offset, value)                              \
+  do {                                                                         \
+    DCHECK_NOT_NULL(GetHeapFromWritableObject(object));                        \
+    static_assert(kTaggedCanConvertToRawObjects);                              \
+    WriteBarrier::ForValue(object, (object)->RawMaybeWeakField(offset), value, \
+                           UPDATE_WRITE_BARRIER);                              \
   } while (false)
 #endif
 #endif