From: v-saha Date: Mon, 12 Aug 2024 10:35:38 +0000 (+0530) Subject: [M126][Tizen][Offscreen] Fix build errors for tizen standard profile X-Git-Tag: submit/tizen/20250225.160418~90 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93fb8d184fb40daa48cf1622fc4dd2a56e61aeae;p=platform%2Fframework%2Fweb%2Fchromium-efl.git [M126][Tizen][Offscreen] Fix build errors for tizen standard profile This commit fixes all gn related, compilation and linker errors for tizen standard build. Basic rendering works fine and google.com loads as expected on RPI4. Change-Id: Ic1ddef38e20d02b17a2f81e5371c1bd552a96522 Signed-off-by: Chandan Padhi Signed-off-by: v-saha Signed-off-by: uzair --- diff --git a/base/BUILD.gn b/base/BUILD.gn index 32fc6da29ba8..4fb12d333985 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1658,7 +1658,7 @@ component("base") { ] } - if (is_linux || is_chromeos || is_android || is_fuchsia) { + if (is_linux || is_chromeos || is_android || is_fuchsia || is_tizen) { sources += [ "task/thread_pool/semaphore/semaphore_posix.cc" ] } @@ -2519,7 +2519,7 @@ component("base") { } } -if (is_linux || is_chromeos) { +if (is_linux || is_chromeos || is_tizen) { # Split out as a separate target for two reasons: # - the line number reader is 2x slower in debug builds if not optimized, # leading to a worse dev experience and test timeouts. diff --git a/base/logging.cc b/base/logging.cc index 2546634d0c53..9383cb644aef 100644 --- a/base/logging.cc +++ b/base/logging.cc @@ -913,16 +913,16 @@ void LogMessage::Flush() { #if BUILDFLAG(IS_TIZEN) log_priority priority = DLOG_UNKNOWN; switch (severity_) { - case LOG_INFO: + case LOGGING_INFO: priority = DLOG_INFO; break; - case LOG_WARNING: + case LOGGING_WARNING: priority = DLOG_WARN; break; - case LOG_ERROR: + case LOGGING_ERROR: priority = DLOG_ERROR; break; - case LOG_FATAL: + case LOGGING_FATAL: priority = DLOG_FATAL; break; } diff --git a/build/config/c++/c++.gni b/build/config/c++/c++.gni index e7bf4cd86f41..6a2c3c65e8c3 100644 --- a/build/config/c++/c++.gni +++ b/build/config/c++/c++.gni @@ -13,7 +13,7 @@ declare_args() { # Don't check in changes that set this to false for more platforms; doing so # is not supported. use_custom_libcxx = is_fuchsia || is_android || is_apple || is_linux || - is_chromeos || (is_win && is_clang) + is_chromeos || (is_win && is_clang) || is_tizen # Use libc++ instead of stdlibc++ when using the host_cpu toolchain, even if # use_custom_libcxx is false. This is useful for cross-compiles where a custom diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc index 4964732803f3..51c198228be3 100644 --- a/cc/test/render_pass_test_utils.cc +++ b/cc/test/render_pass_test_utils.cc @@ -511,6 +511,9 @@ std::unique_ptr CopyToAggregatedRenderPass( from_pass->backdrop_filters, from_pass->backdrop_filter_bounds, content_usage, from_pass->has_transparent_background, +#if defined(TIZEN_VIDEO_HOLE) + false, +#endif from_pass->cache_render_pass, from_pass->has_damage_from_contributing_content, from_pass->generate_mipmap); diff --git a/components/components_strings.grd b/components/components_strings.grd index f0ade3fac316..05c39e8c444f 100644 --- a/components/components_strings.grd +++ b/components/components_strings.grd @@ -360,7 +360,6 @@ - Cancel @@ -368,7 +367,6 @@ Clear - Close diff --git a/components/crash/core/common/BUILD.gn b/components/crash/core/common/BUILD.gn index 2082077c2e02..aae97a2cd4a5 100644 --- a/components/crash/core/common/BUILD.gn +++ b/components/crash/core/common/BUILD.gn @@ -9,7 +9,7 @@ import("//components/gwp_asan/buildflags/buildflags.gni") declare_args() { # If set to true, this will stub out and disable the entire crash key system. - use_crash_key_stubs = is_fuchsia + use_crash_key_stubs = is_fuchsia || is_tizen } group("common") { diff --git a/components/enterprise/buildflags/buildflags.gni b/components/enterprise/buildflags/buildflags.gni index 7a155bd2ffc4..96c604a8510c 100644 --- a/components/enterprise/buildflags/buildflags.gni +++ b/components/enterprise/buildflags/buildflags.gni @@ -15,13 +15,14 @@ declare_args() { # Indicates support for content analysis against a cloud agent for Enterprise # Connector policies. - enterprise_local_content_analysis = is_win || is_mac || is_linux + enterprise_local_content_analysis = is_win || is_mac || is_linux || is_tizen # Indicates support for Data Control rules. - enterprise_data_controls = is_win || is_mac || is_linux || is_chromeos + enterprise_data_controls = + is_win || is_mac || is_linux || is_chromeos || is_tizen # Indicates support for client certificates provisioning. - enterprise_client_certificates = is_win || is_mac || is_linux + enterprise_client_certificates = is_win || is_mac || is_linux || is_tizen # The watermark is currently implemented using the views framework. enterprise_watermark = diff --git a/components/system_cpu/BUILD.gn b/components/system_cpu/BUILD.gn index dd7e851dea6b..05a4ae0de149 100644 --- a/components/system_cpu/BUILD.gn +++ b/components/system_cpu/BUILD.gn @@ -17,7 +17,7 @@ source_set("system_cpu") { libs = [] - if (is_linux || is_chromeos) { + if (is_linux || is_chromeos || is_tizen) { sources += [ "core_times.cc", "core_times.h", diff --git a/content/browser/interest_group/storage_interest_group.h b/content/browser/interest_group/storage_interest_group.h index 2c783a97c6b8..7a06ae22dd32 100644 --- a/content/browser/interest_group/storage_interest_group.h +++ b/content/browser/interest_group/storage_interest_group.h @@ -47,15 +47,6 @@ struct CONTENT_EXPORT StorageInterestGroup { bool is_k_anonymous; // The last time the unique user count was updated. base::Time last_updated; - -#if BUILDFLAG(IS_TIZEN) - KAnonymityData(std::string key, - bool is_k_anonymous, - base::Time last_updated) - : key(key), - is_k_anonymous(is_k_anonymous), - last_updated(last_updated) {} -#endif }; blink::InterestGroup interest_group; diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h index 5b4e90e2a929..0fa51581eb54 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -187,7 +187,11 @@ class CONTENT_EXPORT RenderViewHostImpl bool is_active() const { return main_frame_routing_id_ != MSG_ROUTING_NONE; } // Returns true if the `blink::WebView` is active and has not crashed. +#if BUILDFLAG(IS_TIZEN) + bool IsRenderViewLive() const override; +#else bool IsRenderViewLive() const; +#endif // Called when the `blink::WebView` in the renderer process has been created, // at which point IsRenderViewLive() becomes true, and the mojo connections to diff --git a/content/common/features.gni b/content/common/features.gni index ea3675d6b5ee..811a61a6eeb2 100644 --- a/content/common/features.gni +++ b/content/common/features.gni @@ -24,5 +24,5 @@ declare_args() { content_enable_legacy_ipc = is_android || enable_ppapi || use_efl } -enable_screen_capture = - is_linux || is_chromeos || is_mac || is_win || is_android || is_fuchsia +enable_screen_capture = is_linux || is_chromeos || is_mac || is_win || + is_android || is_fuchsia || is_tizen diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn index dd4182b68194..56107bd0cb6f 100644 --- a/content/gpu/BUILD.gn +++ b/content/gpu/BUILD.gn @@ -91,10 +91,6 @@ target(link_target_type, "gpu_sources") { "//ui/latency/ipc", ] - if (is_tizen) { - sources += [ "gpu_sandbox_hook_linux.cc" ] - } - if (!is_chromeos_ash || !is_chrome_branded) { deps += [ "//services/shape_detection:lib", diff --git a/content/public/browser/speech_recognition_manager_delegate.h b/content/public/browser/speech_recognition_manager_delegate.h index bd9ce9e8d8d9..c97f5a356c33 100644 --- a/content/public/browser/speech_recognition_manager_delegate.h +++ b/content/public/browser/speech_recognition_manager_delegate.h @@ -6,6 +6,7 @@ #define CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_ #include "base/functional/callback_forward.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" #if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_ANDROID) namespace media::mojom { diff --git a/content/renderer/accessibility/render_accessibility_impl.cc b/content/renderer/accessibility/render_accessibility_impl.cc index 62e80416fdce..df90a775a8bd 100644 --- a/content/renderer/accessibility/render_accessibility_impl.cc +++ b/content/renderer/accessibility/render_accessibility_impl.cc @@ -104,7 +104,7 @@ RenderAccessibilityImpl::RenderAccessibilityImpl( ukm_recorder_ = ukm::MojoUkmRecorder::Create(*factory); #if defined(TIZEN_ATK_SUPPORT) - settings->SetAccessibilityEnabled(true); + render_frame_->GetWebView()->GetSettings()->SetAccessibilityEnabled(true); #endif #if BUILDFLAG(IS_ANDROID) diff --git a/electron/chromium_src/BUILD.gn b/electron/chromium_src/BUILD.gn index e0471b1b3fce..9280b99a56b5 100644 --- a/electron/chromium_src/BUILD.gn +++ b/electron/chromium_src/BUILD.gn @@ -92,8 +92,6 @@ static_library("chrome") { "//chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h", "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc", "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h", - "//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc", - "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h", "//chrome/browser/ui/frame/window_frame_util.cc", "//chrome/browser/ui/frame/window_frame_util.h", "//chrome/browser/ui/ui_features.cc", diff --git a/media/filters/demuxer_manager.cc b/media/filters/demuxer_manager.cc index 759c851d436a..9f02488c57f5 100644 --- a/media/filters/demuxer_manager.cc +++ b/media/filters/demuxer_manager.cc @@ -644,7 +644,13 @@ std::unique_ptr DemuxerManager::CreateMediaUrlDemuxer( std::unique_ptr media_url_demuxer = std::make_unique( media_task_runner_, loaded_url_, site_for_cookies_, top_frame_origin_, +#if BUILDFLAG(IS_ANDROID) has_storage_access_, allow_media_player_renderer_credentials_, +#else + // The platform media player in Tizen OS doesn't require these params + // except for the url, so they are not used for tizen multimedia. + true, true, +#endif expect_hls_content); media_url_demuxer->SetHeaders(headers); return media_url_demuxer; diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec index 07a9f5cef012..d56f900bfdb6 100644 --- a/packaging/chromium-efl.spec +++ b/packaging/chromium-efl.spec @@ -2,9 +2,9 @@ Name: chromium-efl Summary: Chromium EFL # Version: {TPK_VERSION}.{INTERNAL_API_REVISION}.{CHROMIUM_MAJOR_VERSION} # The {INTERNAL_API_REVISION} is used for compatibility check with wrtjs. -Version: 1.1.120 +Version: 1.1.126 # Set by ./tizen_src/scripts/update_chromium_version.sh -%define upstream_chromium_version 120.0.6099.5 +%define upstream_chromium_version 126.0.6478.126 Release: 1 # The 'Group' should be specified as one of the following valid group list. # https://wiki.tizen.org/wiki/Packaging/Guidelines#Group_Tag @@ -252,7 +252,7 @@ BuildRequires: pkgconfig(capi-boost-tv) %define __use_clang 0 %endif -%define __enable_wrt_js 1 +%define __enable_wrt_js 0 %if 0%{?_disable_wrt_js} %define __enable_wrt_js 0 %endif @@ -549,8 +549,10 @@ touch ./tizen_src/downloadable/ewk_api_wrapper_generator.py "enable_ewk_interface=true" \ %endif "enable_wrt_js=%{macro_to_bool __enable_wrt_js}" \ +%if 0%{?__enable_wrt_js} "xwalk_extension_path=\"%{__xwalk_extension_path}\"" \ "xwalk_extension_service_path=\"%{__xwalk_extension_service_path}\"" \ +%endif %if %{__enable_network_camera} "enable_network_camera=true" \ %endif @@ -699,10 +701,6 @@ install -d "%{buildroot}"%{_includedir}/node install -m 0644 third_party/electron_node/src/*.h "%{buildroot}"%{_includedir}/node/ %endif -%if "%{?tizen_profile_name}" != "tv" -install -m 0644 %{_libdir}/libscl-common.so "%{buildroot}"%{_libdir} -%endif - %if %{__build_chrome} == 1 install -m 0755 "%{OUTPUT_FOLDER}"/content_shell "%{buildroot}"%{CHROMIUM_LIB_DIR}/bin/ sed 's#@binary@#%{CHROMIUM_LIB_DIR}/bin/content_shell#' %{SOURCE1} > "%{buildroot}"%{_bindir}/content_shell @@ -1084,9 +1082,6 @@ rm -rf %{CHROMIUM_TPK_DIR}/%{_tpk_file_name}.tpk %endif %{_xmldir}/%{_pkgid}.xml %defattr(-,root,root,-) -%if "%{?tizen_profile_name}" != "tv" - %{_libdir}/libscl-common.so -%endif %if %{__use_clang} == 1 %{_libdir}/../local/lib/libatomic.so* %endif diff --git a/services/device/geolocation/location_arbitrator.cc b/services/device/geolocation/location_arbitrator.cc index 7121e759847f..107db8b76968 100644 --- a/services/device/geolocation/location_arbitrator.cc +++ b/services/device/geolocation/location_arbitrator.cc @@ -202,8 +202,7 @@ LocationArbitrator::NewSystemLocationProvider() { #if BUILDFLAG(IS_TIZEN) && !defined(BUILD_CHROME) if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnableOffscreenRendering)) { - return device::NewSystemLocationProvider(main_task_runner_, - geolocation_manager_); + return device::NewSystemLocationProvider(); } #endif diff --git a/services/network/network_context.cc b/services/network/network_context.cc index df4acfedf70e..907922a68f57 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc @@ -527,7 +527,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN) // FIXME: m126 bringup bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { diff --git a/services/network/network_context.h b/services/network/network_context.h index 2cc1481366c0..1e20f2d057cb 100644 --- a/services/network/network_context.h +++ b/services/network/network_context.h @@ -672,14 +672,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext bool IsNetworkForNonceAndUrlAllowed(const base::UnguessableToken& nonce, const GURL& url) const; - void CreateCookieManager(mojom::NetworkContextParamsPtr params); + void CreateCookieManager(mojom::NetworkContextParamsPtr params) override; private: class NetworkContextHttpAuthPreferences : public net::HttpAuthPreferences { public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN) // FIXME: m126 bringup bool AllowGssapiLibraryLoad() const override; #endif // BUILDFLAG(IS_LINUX) private: diff --git a/services/on_device_model/BUILD.gn b/services/on_device_model/BUILD.gn index aec84d706d3d..68ba63b09838 100644 --- a/services/on_device_model/BUILD.gn +++ b/services/on_device_model/BUILD.gn @@ -55,7 +55,7 @@ template("model_service") { ] } - if (is_linux || is_chromeos) { + if (is_linux || is_chromeos || is_tizen) { deps += [ "//gpu/config", "//third_party/dawn/include/dawn:cpp_headers", diff --git a/third_party/blink/renderer/core/loader/frame_loader.cc b/third_party/blink/renderer/core/loader/frame_loader.cc index 07c4cf6b137e..41a8f3a5a506 100644 --- a/third_party/blink/renderer/core/loader/frame_loader.cc +++ b/third_party/blink/renderer/core/loader/frame_loader.cc @@ -847,7 +847,7 @@ void FrameLoader::StartNavigation(FrameLoadRequest& request, using CSPDisposition = network::mojom::CSPDisposition; CSPDisposition should_check_main_world_csp = ContentSecurityPolicy::ShouldBypassMainWorldDeprecated( - request.JavascriptWorld().get()) + request.JavascriptWorld()) ? CSPDisposition::DO_NOT_CHECK : CSPDisposition::CHECK; diff --git a/third_party/blink/renderer/modules/mediastream/user_media_processor.cc b/third_party/blink/renderer/modules/mediastream/user_media_processor.cc index dbc240c6eee6..4b939bbf8940 100644 --- a/third_party/blink/renderer/modules/mediastream/user_media_processor.cc +++ b/third_party/blink/renderer/modules/mediastream/user_media_processor.cc @@ -1039,7 +1039,7 @@ void UserMediaProcessor::SelectVideoDeviceSettings( settings, false /* is_content_capture */); } -#if defined(TIZEN_MULTIMEDIA) +#if defined(TIZEN_MULTIMEDIA) && !defined(EWK_BRINGUP) // FIXME: m126 bringup if (settings.Format().pixel_format == media::PIXEL_FORMAT_ENCODED #if defined(TIZEN_MULTIMEDIA_MJPEG_SUPPORT) || settings.Format().pixel_format == media::PIXEL_FORMAT_MJPEG diff --git a/third_party/blink/renderer/modules/mediastream/web_media_player_ms_compositor.h b/third_party/blink/renderer/modules/mediastream/web_media_player_ms_compositor.h index bca5dd6d1520..9eab43af4262 100644 --- a/third_party/blink/renderer/modules/mediastream/web_media_player_ms_compositor.h +++ b/third_party/blink/renderer/modules/mediastream/web_media_player_ms_compositor.h @@ -114,6 +114,11 @@ class MODULES_EXPORT WebMediaPlayerMSCompositor void PutCurrentFrame() override; base::TimeDelta GetPreferredRenderInterval() override; void OnContextLost() override; +#if defined(TIZEN_VIDEO_HOLE) + void SetDrawableContentRectChangedCallback( + cc::DrawableContentRectChangedCallback cb) override {} + void OnDrawableContentRectChanged(const gfx::Rect&) override {} +#endif void StartRendering(); void StopRendering(); diff --git a/third_party/dawn/scripts/dawn_component.gni b/third_party/dawn/scripts/dawn_component.gni index ffbfcc4f99ea..79d1dbc60386 100644 --- a/third_party/dawn/scripts/dawn_component.gni +++ b/third_party/dawn/scripts/dawn_component.gni @@ -144,7 +144,7 @@ template("dawn_component") { } else if (!defined(invoker.sources) || invoker.sources == []) { # When there are no sources defined, use a source set to avoid creating # an empty static library (which generally don't work). - _static_target_type = "source_set" + _static_target_type = "static_library" } else { # Use static libraries for the static build rather than source sets because # many of of our test binaries link many large dependencies but often don't diff --git a/third_party/dawn/scripts/dawn_features.gni b/third_party/dawn/scripts/dawn_features.gni index 11d25c14aa15..a47113218865 100644 --- a/third_party/dawn/scripts/dawn_features.gni +++ b/third_party/dawn/scripts/dawn_features.gni @@ -52,7 +52,7 @@ declare_args() { # Enables SwiftShader as the fallback adapter. Requires dawn_swiftshader_dir # to be set to take effect. # TODO(dawn:1536): Enable SwiftShader for Android. - dawn_use_swiftshader = !is_android && !is_ios + dawn_use_swiftshader = !is_android && !is_ios && !is_tizen # Whether we allow building DXC. # DXC requires SM6.0+ which is blocklisted on x86. diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh index c0b3c3301d9d..34f2dea0f683 100755 --- a/tizen_src/build/common.sh +++ b/tizen_src/build/common.sh @@ -3,7 +3,7 @@ export SCRIPTDIR=$(readlink -e $(dirname $0)) export TOPDIR=$(readlink -f "${SCRIPTDIR}/../..") export CHROME_SRC="${TOPDIR}" -export LATEST_TIZEN_VERSION=8.0 +export LATEST_TIZEN_VERSION=9.0 export DEFAULT_TIZEN_VERSION=$LATEST_TIZEN_VERSION if [ "$(echo "$@" | grep -e "--tizen")" != "" ]; then diff --git a/tizen_src/build/config/compiler/BUILD.gn b/tizen_src/build/config/compiler/BUILD.gn index b89e9e0271c4..b484dc347043 100644 --- a/tizen_src/build/config/compiler/BUILD.gn +++ b/tizen_src/build/config/compiler/BUILD.gn @@ -138,11 +138,7 @@ config("tizen_default_include_dirs") { "$deps_lib_path/gstreamer-1.0/include/gst", ] if (is_clang) { - include_dirs += [ - "$tizen_clang_base_path/lib64/clang/18/include", - "$deps_lib_path/gcc/armv7l-tizen-linux-gnueabi/$gcc_ver/include/c++", - "$deps_lib_path/gcc/armv7l-tizen-linux-gnueabi/$gcc_ver/include/c++/armv7l-tizen-linux-gnueabi", - ] + include_dirs += [ "$tizen_clang_base_path/lib64/clang/18/include" ] } } } diff --git a/tizen_src/build/config/tizen_features.gni b/tizen_src/build/config/tizen_features.gni index afc058c1150c..ec4f50e7cffa 100644 --- a/tizen_src/build/config/tizen_features.gni +++ b/tizen_src/build/config/tizen_features.gni @@ -76,7 +76,7 @@ declare_args() { drm_mapi_aarch_64 = false } -if (use_efl && !build_chrome) { +if (!use_efl && !build_chrome) { tizen_autofill = true if (tizen_product_tv) { tizen_autofill_fw = true diff --git a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc index a0f435c41a6e..60078d161366 100644 --- a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc +++ b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc @@ -101,6 +101,7 @@ TizenRendererImpl::TizenRendererImpl( << __func__; // TODO(dalecurtis): Remove once experiments for http://crbug.com/470940 are // complete. +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup int threshold_ms = 0; std::string threshold_ms_str( base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( @@ -108,6 +109,7 @@ TizenRendererImpl::TizenRendererImpl( if (base::StringToInt(threshold_ms_str, &threshold_ms) && threshold_ms > 0) { NOTIMPLEMENTED(); } +#endif } TizenRendererImpl::~TizenRendererImpl() { diff --git a/tizen_src/chromium_impl/content/browser/speech/tizen_speech_recognition_manager_delegate.h b/tizen_src/chromium_impl/content/browser/speech/tizen_speech_recognition_manager_delegate.h index f435984f77ba..b1b89c9550cc 100644 --- a/tizen_src/chromium_impl/content/browser/speech/tizen_speech_recognition_manager_delegate.h +++ b/tizen_src/chromium_impl/content/browser/speech/tizen_speech_recognition_manager_delegate.h @@ -16,10 +16,9 @@ class SpeechRecognitionEventListener; class TizenSpeechRecognitionManagerDelegate : public SpeechRecognitionManagerDelegate { public: - TizenSpeechRecognitionManagerDelegate() {} - ~TizenSpeechRecognitionManagerDelegate() override {} + TizenSpeechRecognitionManagerDelegate() = default; + ~TizenSpeechRecognitionManagerDelegate() override = default; - private: TizenSpeechRecognitionManagerDelegate( const TizenSpeechRecognitionManagerDelegate&) = delete; TizenSpeechRecognitionManagerDelegate& operator=( @@ -33,6 +32,9 @@ class TizenSpeechRecognitionManagerDelegate return nullptr; } bool FilterProfanities(int render_process_id) override { return false; } + void BindSpeechRecognitionContext( + mojo::PendingReceiver receiver) + override {} }; } // namespace content diff --git a/tizen_src/chromium_impl/content/renderer/media/tizen/media_player_renderer_client.cc b/tizen_src/chromium_impl/content/renderer/media/tizen/media_player_renderer_client.cc index 988f07ad2ffb..6e076df6bb45 100644 --- a/tizen_src/chromium_impl/content/renderer/media/tizen/media_player_renderer_client.cc +++ b/tizen_src/chromium_impl/content/renderer/media/tizen/media_player_renderer_client.cc @@ -136,15 +136,15 @@ void MediaPlayerRendererClient::OnNewFrameAvailable( // V Plane buffer. uint8_t* video_buf_v = video_buf_u + c_frm_size; libyuv::I420Copy( - video_buf, video_frame.get()->stride(media::VideoFrame::kYPlane), - video_buf_u, video_frame.get()->stride(media::VideoFrame::kYPlane) / 2, - video_buf_v, video_frame.get()->stride(media::VideoFrame::kYPlane) / 2, - video_frame.get()->GetWritableVisibleData(media::VideoFrame::kYPlane), - video_frame.get()->stride(media::VideoFrame::kYPlane), - video_frame.get()->GetWritableVisibleData(media::VideoFrame::kUPlane), - video_frame.get()->stride(media::VideoFrame::kUPlane), - video_frame.get()->GetWritableVisibleData(media::VideoFrame::kVPlane), - video_frame.get()->stride(media::VideoFrame::kVPlane), width, height); + video_buf, video_frame.get()->stride(media::VideoFrame::Plane::kY), + video_buf_u, video_frame.get()->stride(media::VideoFrame::Plane::kY) / 2, + video_buf_v, video_frame.get()->stride(media::VideoFrame::Plane::kY) / 2, + video_frame.get()->GetWritableVisibleData(media::VideoFrame::Plane::kY), + video_frame.get()->stride(media::VideoFrame::Plane::kY), + video_frame.get()->GetWritableVisibleData(media::VideoFrame::Plane::kU), + video_frame.get()->stride(media::VideoFrame::Plane::kU), + video_frame.get()->GetWritableVisibleData(media::VideoFrame::Plane::kV), + video_frame.get()->stride(media::VideoFrame::Plane::kV), width, height); sink_->PaintSingleFrame(std::move(video_frame)); } diff --git a/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.cc b/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.cc index 729eff05605b..d2ca02a82df8 100644 --- a/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.cc +++ b/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.cc @@ -8,7 +8,6 @@ #include "base/synchronization/lock.h" #include "base/trace_event/trace_event.h" #include "media/base/video_codecs.h" -#include "media/base/video_color_space.h" #include "media/base/video_frame_metadata.h" #include "media/base/video_transformation.h" #include "media/capture/mojom/image_capture_types.h" @@ -371,7 +370,10 @@ void VideoCaptureDeviceTizen::PreviewCameraCaptured(ScopedMediaPacket pkt) { #endif videocaptureformat.frame_size = gfx::Size(dest_width, dest_height); auto reservation_result_code = client_->ReserveOutputBuffer( - videocaptureformat.frame_size, media::PIXEL_FORMAT_I420, 0, &buffer_); + videocaptureformat.frame_size, media::PIXEL_FORMAT_I420, + /* frame_feedback_id= */ 0, &buffer_, + /* require_new_buffer_id= */ nullptr, + /* retire_old_buffer_id= */ nullptr); if (reservation_result_code != VideoCaptureDevice::Client::ReserveResult::kSucceeded) { LOG(ERROR) << "Failed to reserve I420 output buffer."; @@ -411,14 +413,14 @@ void VideoCaptureDeviceTizen::PreviewCameraCaptured(ScopedMediaPacket pkt) { first_ref_time_ = now; client_->OnIncomingCapturedBuffer(std::move(buffer_), videocaptureformat, - now, now - first_ref_time_); + now, now - first_ref_time_, std::nullopt); } else if (mime == MEDIA_FORMAT_H264_SP) { base::TimeTicks now = base::TimeTicks::Now(); if (first_ref_time_.is_null()) first_ref_time_ = now; client_->OnIncomingCapturedBuffer(std::move(buffer_), videocaptureformat, - now, now - first_ref_time_); + now, now - first_ref_time_, std::nullopt); } else if (mime == MEDIA_FORMAT_I420) { // FIXME: Verify if I420 format is working. void *data_y, *data_u, *data_v; @@ -441,7 +443,7 @@ void VideoCaptureDeviceTizen::PreviewCameraCaptured(ScopedMediaPacket pkt) { first_ref_time_ = now; client_->OnIncomingCapturedBuffer(std::move(buffer_), videocaptureformat, - now, now - first_ref_time_); + now, now - first_ref_time_, std::nullopt); } else { LOG(ERROR) << "frame->format( " << mime << ") is not implemented or not supported by chromium."; @@ -520,7 +522,9 @@ void VideoCaptureDeviceTizen::OnCameraCaptured(camera_preview_data_s* frame, : gfx::Size(frame->width, frame->height)); auto reservation_result_code = self->client_->ReserveOutputBuffer( - frame_size, ConvertPixelFormat(frame->format), 0, &self->buffer_); + frame_size, ConvertPixelFormat(frame->format), /* frame_feedback_id= */ 0, + &self->buffer_, /* require_new_buffer_id= */ nullptr, + /* retire_old_buffer_id= */ nullptr); if (reservation_result_code != VideoCaptureDevice::Client::ReserveResult::kSucceeded) { @@ -591,9 +595,9 @@ void VideoCaptureDeviceTizen::OnCameraCaptured(camera_preview_data_s* frame, if (self->first_ref_time_.is_null()) self->first_ref_time_ = now; - self->client_->OnIncomingCapturedBuffer(std::move(self->buffer_), - videocaptureformat, now, - now - self->first_ref_time_); + self->client_->OnIncomingCapturedBuffer( + std::move(self->buffer_), videocaptureformat, now, + now - self->first_ref_time_, std::nullopt); // statistics & log every seconds ++(self->frame_total_); diff --git a/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.h b/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.h index f10a00b434bf..9c5d3da7ab6e 100644 --- a/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.h +++ b/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.h @@ -13,6 +13,7 @@ #include "base/time/time.h" #include "media/base/efl/media_player_util_efl.h" #include "media/base/video_codecs.h" +#include "media/base/video_color_space.h" #include "media/capture/video/tizen/camera_device_tizen.h" #include "media/capture/video/video_capture_device.h" diff --git a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc index 9c7290d32aec..e8f6de108f4c 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc +++ b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc @@ -854,7 +854,7 @@ esplusplayer_submit_status MediaPlayerESPlusPlayer::SubmitEsPacket( packet.type = GetESPlusPlayerStreamType(type); packet.buffer = (char*)(const_cast(buffer->data())); - packet.buffer_size = buffer->data_size(); + packet.buffer_size = buffer->size(); packet.pts = buffer->timestamp().InMilliseconds(); packet.duration = buffer->duration().InMilliseconds(); @@ -1218,15 +1218,15 @@ void MediaPlayerESPlusPlayer::OnFrameReady( uint8_t* video_buf_v = video_buf_u + c_frm_size; libyuv::I420Copy( - video_buf, video_frame.get()->stride(VideoFrame::kYPlane), video_buf_u, - video_frame.get()->stride(VideoFrame::kYPlane) / 2, video_buf_v, - video_frame.get()->stride(VideoFrame::kYPlane) / 2, - video_frame.get()->GetWritableVisibleData(VideoFrame::kYPlane), - video_frame.get()->stride(VideoFrame::kYPlane), - video_frame.get()->GetWritableVisibleData(VideoFrame::kUPlane), - video_frame.get()->stride(VideoFrame::kUPlane), - video_frame.get()->GetWritableVisibleData(VideoFrame::kVPlane), - video_frame.get()->stride(VideoFrame::kVPlane), width, height); + video_buf, video_frame.get()->stride(VideoFrame::Plane::kY), + video_buf_u, video_frame.get()->stride(VideoFrame::Plane::kY) / 2, + video_buf_v, video_frame.get()->stride(VideoFrame::Plane::kY) / 2, + video_frame.get()->GetWritableVisibleData(VideoFrame::Plane::kY), + video_frame.get()->stride(VideoFrame::Plane::kY), + video_frame.get()->GetWritableVisibleData(VideoFrame::Plane::kU), + video_frame.get()->stride(VideoFrame::Plane::kU), + video_frame.get()->GetWritableVisibleData(VideoFrame::Plane::kV), + video_frame.get()->stride(VideoFrame::Plane::kV), width, height); esplusplayer_decoded_buffer_destroy( esplayer_, const_cast(packet)); diff --git a/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_efl.cc b/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_efl.cc index 59a3966129b9..0ad80fd278bc 100644 --- a/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_efl.cc +++ b/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_efl.cc @@ -31,9 +31,10 @@ bool HaveValuesChanged(const SensorReading& lhs, const SensorReading& rhs) { } // namespace -PlatformSensorEfl::PlatformSensorEfl(mojom::SensorType type, - SensorReadingSharedBuffer* reading_buffer, - PlatformSensorProvider* provider) +PlatformSensorEfl::PlatformSensorEfl( + mojom::SensorType type, + SensorReadingSharedBuffer* reading_buffer, + base::WeakPtr provider) : PlatformSensor(type, reading_buffer, provider), default_configuration_(PlatformSensorConfiguration()), weak_factory_(this) { diff --git a/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_efl.h b/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_efl.h index a9fcd986a04a..74f090074190 100644 --- a/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_efl.h +++ b/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_efl.h @@ -15,7 +15,7 @@ class PlatformSensorEfl : public PlatformSensor { public: PlatformSensorEfl(mojom::SensorType type, SensorReadingSharedBuffer* reading_buffer, - PlatformSensorProvider* provider); + base::WeakPtr provider); PlatformSensorEfl(const PlatformSensorEfl&) = delete; PlatformSensorEfl& operator=(const PlatformSensorEfl&) = delete; diff --git a/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_provider_efl.cc b/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_provider_efl.cc index 1b67c2652f54..bbad44619aed 100644 --- a/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_provider_efl.cc +++ b/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_provider_efl.cc @@ -4,37 +4,31 @@ #include "services/device/generic_sensor/platform_sensor_provider_efl.h" -#include -#include #include "base/memory/ref_counted.h" -#include "base/memory/singleton.h" #include "services/device/generic_sensor/platform_sensor_efl.h" #include "services/device/generic_sensor/platform_sensor_reader_efl.h" namespace device { -PlatformSensorProviderEfl::PlatformSensorProviderEfl() {} +PlatformSensorProviderEfl::PlatformSensorProviderEfl() = default; -PlatformSensorProviderEfl::~PlatformSensorProviderEfl() {} +PlatformSensorProviderEfl::~PlatformSensorProviderEfl() = default; + +base::WeakPtr PlatformSensorProviderEfl::AsWeakPtr() { + return weak_factory_.GetWeakPtr(); +} void PlatformSensorProviderEfl::CreateSensorInternal( mojom::SensorType type, - SensorReadingSharedBuffer* reading_buffer, CreateSensorCallback callback) { if (!SensorReaderEfl::IsSensorTypeSupported(type)) { std::move(callback).Run(nullptr); return; } - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - scoped_refptr sensor = - new PlatformSensorEfl(type, reading_buffer, this); - std::move(callback).Run(sensor); -} - -void PlatformSensorProviderEfl::FreeResources() { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); + std::move(callback).Run(base::MakeRefCounted( + type, GetSensorReadingSharedBufferForType(type), AsWeakPtr())); } } // namespace device diff --git a/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_provider_efl.h b/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_provider_efl.h index d382187dab06..8515ba07f973 100644 --- a/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_provider_efl.h +++ b/tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_provider_efl.h @@ -5,13 +5,9 @@ #ifndef SERVICES_DEVICE_GENERIC_SENSOR_PUBLIC_PLATFORM_SENSOR_PROVIDER_EFL_H_ #define SERVICES_DEVICE_GENERIC_SENSOR_PUBLIC_PLATFORM_SENSOR_PROVIDER_EFL_H_ +#include "base/memory/weak_ptr.h" #include "services/device/generic_sensor/platform_sensor_provider.h" -namespace base { -template -struct DefaultSingletonTraits; -} // namespace base - namespace device { class PlatformSensorEfl; @@ -25,15 +21,14 @@ class PlatformSensorProviderEfl : public PlatformSensorProvider { PlatformSensorProviderEfl& operator=(const PlatformSensorProviderEfl&) = delete; + base::WeakPtr AsWeakPtr() override; + protected: void CreateSensorInternal(mojom::SensorType type, - SensorReadingSharedBuffer* reading_buffer, CreateSensorCallback callback) override; - void FreeResources() override; - private: - friend struct base::DefaultSingletonTraits; + base::WeakPtrFactory weak_factory_{this}; }; } // namespace device diff --git a/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl_wayland.cc b/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl_wayland.cc index ed21a61fa28f..bf41c27bd364 100644 --- a/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl_wayland.cc +++ b/tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl_wayland.cc @@ -138,9 +138,9 @@ bool ClipboardHelperEfl::Base64ImageTagFromImagePath(const std::string& path, LOG(ERROR) << "[CLIPBOARD] couldn't read file: " << path; return false; } - +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup base::Base64Encode(file_contents, &file_contents); - +#endif *image_html = kDataURIImagePrefix; *image_html += file_contents; *image_html += kDataURIImageSuffix; diff --git a/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.cc b/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.cc index 9e06f6fa7530..fb88506cde28 100644 --- a/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.cc @@ -49,10 +49,7 @@ void AutofillClientEfl::CreateForWebContents(content::WebContents* contents) { } AutofillClientEfl::AutofillClientEfl(content::WebContents* web_contents) - : ContentAutofillClient(web_contents, - base::BindRepeating(&BrowserDriverInitHook, - this, - EWebView::GetPlatformLocale())), + : ContentAutofillClient(web_contents), content::WebContentsObserver(web_contents), web_contents_(web_contents) { DCHECK(web_contents); @@ -103,7 +100,8 @@ syncer::SyncService* AutofillClientEfl::GetSyncService() { return nullptr; } -void AutofillClientEfl::ShowAutofillSettings(PopupType popup_type) { +void AutofillClientEfl::ShowAutofillSettings( + FillingProduct main_filling_product) { NOTIMPLEMENTED(); } @@ -128,9 +126,9 @@ void AutofillClientEfl::ConfirmCreditCardFillAssist( NOTIMPLEMENTED(); } -void AutofillClientEfl::ShowAutofillPopup( +void AutofillClientEfl::ShowAutofillSuggestions( const PopupOpenArgs& open_args, - base::WeakPtr delegate) { + base::WeakPtr delegate) { DCHECK(web_contents_); LOG(INFO) << "[Autofill] " << __FUNCTION__ << " suggestions.size : " << open_args.suggestions.size(); @@ -155,23 +153,12 @@ void AutofillClientEfl::ShowAutofillPopup( } } -void AutofillClientEfl::ShowUnmaskPrompt( - const CreditCard& card, - const CardUnmaskPromptOptions& card_unmask_prompt_options, - base::WeakPtr delegate) { - NOTIMPLEMENTED(); -} - -void AutofillClientEfl::UpdateAutofillPopupDataListValues( +void AutofillClientEfl::UpdateAutofillDataListValues( base::span datalist) { NOTIMPLEMENTED(); } -void AutofillClientEfl::OnUnmaskVerificationResult(PaymentsRpcResult result) { - NOTIMPLEMENTED(); -} - -bool AutofillClientEfl::HasCreditCardScanFeature() { +bool AutofillClientEfl::HasCreditCardScanFeature() const { return false; } @@ -222,7 +209,7 @@ AutofillClientEfl::GetSecurityLevelForUmaHistograms() { return security_state::SecurityLevel::SECURITY_LEVEL_COUNT; } -void AutofillClientEfl::HideAutofillPopup(PopupHidingReason reason) { +void AutofillClientEfl::HideAutofillSuggestions(SuggestionHidingReason reason) { #if defined(TIZEN_AUTOFILL_FW) LOG(INFO) << "[Autofill] " << __FUNCTION__ << " Autofill fw is enabled. return directly"; @@ -264,7 +251,8 @@ void AutofillClientEfl::ShowLocalCardMigrationResults( const bool has_server_error, const std::u16string& tip_message, const std::vector& migratable_credit_cards, - MigrationDeleteCardCallback delete_local_card_callback) { + payments::PaymentsAutofillClient::MigrationDeleteCardCallback + delete_local_card_callback) { NOTIMPLEMENTED(); } @@ -278,7 +266,15 @@ AutocompleteHistoryManager* AutofillClientEfl::GetAutocompleteHistoryManager() { return factory->AutocompleteHistoryManagerForContext(ctx); } -payments::PaymentsClient* AutofillClientEfl::GetPaymentsClient() { +std::unique_ptr AutofillClientEfl::CreateManager( + base::PassKey pass_key, + ContentAutofillDriver& driver) { + NOTIMPLEMENTED(); + return nullptr; +} + +payments::PaymentsAutofillClient* +AutofillClientEfl::GetPaymentsAutofillClient() { NOTIMPLEMENTED(); return nullptr; } @@ -299,11 +295,11 @@ void AutofillClientEfl::PrimaryMainFrameWasResized(bool width_changed) { if (!width_changed) return; - HideAutofillPopup(PopupHidingReason::kNavigation); + HideAutofillSuggestions(SuggestionHidingReason::kNavigation); } void AutofillClientEfl::WebContentsDestroyed() { - HideAutofillPopup(PopupHidingReason::kViewDestroyed); + HideAutofillSuggestions(SuggestionHidingReason::kViewDestroyed); } AutofillPopupViewEfl * AutofillClientEfl::GetOrCreatePopupController() { @@ -318,7 +314,7 @@ void AutofillClientEfl::DidFillOrPreviewField( NOTIMPLEMENTED(); } -bool AutofillClientEfl::IsOffTheRecord() { +bool AutofillClientEfl::IsOffTheRecord() const { return web_contents_->GetBrowserContext()->IsOffTheRecord(); } @@ -329,21 +325,6 @@ AutofillClientEfl::GetURLLoaderFactory() { ->GetURLLoaderFactoryForBrowserProcess(); } -void AutofillClientEfl::ConfirmSaveIbanLocally( - const Iban& iban, - bool should_show_prompt, - AutofillClient::SaveIbanPromptCallback callback) { - NOTIMPLEMENTED(); -} - -void AutofillClientEfl::ConfirmUploadIbanToCloud( - const Iban& iban, - const LegalMessageLines& legal_message_lines, - bool should_show_prompt, - AutofillClient::SaveIbanPromptCallback callback) { - NOTIMPLEMENTED(); -} - void AutofillClientEfl::ShowEditAddressProfileDialog( const AutofillProfile& profile, AutofillClient::AddressProfileSavePromptCallback @@ -419,14 +400,6 @@ gfx::RectF AutofillClientEfl::GetElementBoundsInScreen( return element_bounds + view_offset; } -void AutofillClientEfl::ConfirmMigrateLocalCardToCloud( - const LegalMessageLines& legal_message_lines, - const std::string& user_email, - const std::vector& migratable_credit_cards, - LocalCardMigrationCallback start_migrating_cards_callback) { - NOTIMPLEMENTED(); -} - void AutofillClientEfl::ShowWebauthnOfferDialog( WebauthnDialogCallback offer_dialog_callback) { NOTIMPLEMENTED(); @@ -446,34 +419,13 @@ bool AutofillClientEfl::CloseWebauthnDialog() { return false; } -void AutofillClientEfl::OfferVirtualCardOptions( - const std::vector& candidates, - base::OnceCallback callback) { - NOTIMPLEMENTED(); -} - -void AutofillClientEfl::CreditCardUploadCompleted(bool card_saved) { +void AutofillClientEfl::PinAutofillSuggestions() { NOTIMPLEMENTED(); } -void AutofillClientEfl::PinPopupView() { - NOTIMPLEMENTED(); -} - -AutofillClient::PopupOpenArgs AutofillClientEfl::GetReopenPopupArgs( - AutofillSuggestionTriggerSource trigger_source) const { - NOTIMPLEMENTED(); - return {}; -} - -std::vector AutofillClientEfl::GetPopupSuggestions() const { - NOTIMPLEMENTED(); - return std::vector(); -} - void AutofillClientEfl::UpdatePopup( const std::vector& suggestions, - PopupType popup_type, + FillingProduct main_filling_product, AutofillSuggestionTriggerSource trigger_source) { NOTIMPLEMENTED(); } @@ -504,10 +456,12 @@ void AutofillClientEfl::ConfirmSaveAddressProfile( NOTIMPLEMENTED(); } +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup void AutofillClientEfl::LoadRiskData( base::OnceCallback callback) { NOTIMPLEMENTED(); } +#endif url::Origin AutofillClientEfl::GetLastCommittedPrimaryMainFrameOrigin() const { NOTREACHED(); diff --git a/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.h b/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.h index 24d9ccc0f275..acc115dffe22 100644 --- a/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.h +++ b/tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.h @@ -12,6 +12,8 @@ #include "base/memory/weak_ptr.h" #include "browser/autofill_popup_view_efl.h" #include "components/autofill/content/browser/content_autofill_client.h" +#include "components/autofill/core/browser/payments/local_card_migration_manager.h" +#include "components/autofill/core/browser/payments/payments_autofill_client.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/password_manager/core/browser/password_form_manager.h" #include "content/public/browser/web_contents_observer.h" @@ -37,18 +39,11 @@ class AutofillClientEfl : public ContentAutofillClient, static AutofillClientEfl* FromWebContents(content::WebContents*); static void CreateForWebContents(content::WebContents*); - bool IsOffTheRecord() override; + bool IsOffTheRecord() const override; scoped_refptr GetURLLoaderFactory() override; void DidFillOrPreviewForm(mojom::ActionPersistence action, AutofillTriggerSource trigger_source, bool is_refill) override; - void ConfirmSaveIbanLocally(const Iban& iban, - bool should_show_prompt, - SaveIbanPromptCallback callback) override; - void ConfirmUploadIbanToCloud(const Iban& iban, - const LegalMessageLines& legal_message_lines, - bool should_show_prompt, - SaveIbanPromptCallback callback) override; void ShowEditAddressProfileDialog( const AutofillProfile& profile, AddressProfileSavePromptCallback on_user_decision_callback) override; @@ -62,7 +57,7 @@ class AutofillClientEfl : public ContentAutofillClient, PrefService* GetPrefs() override; virtual const PrefService* GetPrefs() const override; syncer::SyncService* GetSyncService() override; - void ShowAutofillSettings(PopupType popup_type) override; + void ShowAutofillSettings(FillingProduct main_filling_product) override; void ConfirmSaveCreditCardLocally( const CreditCard& card, SaveCreditCardOptions options, @@ -74,17 +69,12 @@ class AutofillClientEfl : public ContentAutofillClient, UploadSaveCardPromptCallback callback) override; void ConfirmCreditCardFillAssist(const CreditCard& card, base::OnceClosure callback) override; - void ShowAutofillPopup( + void ShowAutofillSuggestions( const PopupOpenArgs& open_args, - base::WeakPtr delegate) override; - void ShowUnmaskPrompt( - const CreditCard& card, - const CardUnmaskPromptOptions& card_unmask_prompt_options, - base::WeakPtr delegate) override; - void UpdateAutofillPopupDataListValues( + base::WeakPtr delegate) override; + void UpdateAutofillDataListValues( base::span datalist) override; - void OnUnmaskVerificationResult(PaymentsRpcResult result) override; - bool HasCreditCardScanFeature() override; + bool HasCreditCardScanFeature() const override; void ScanCreditCard(CreditCardScanCallback callback) override; bool IsContextSecure() const override; @@ -94,31 +84,19 @@ class AutofillClientEfl : public ContentAutofillClient, AddressNormalizer* GetAddressNormalizer() override; security_state::SecurityLevel GetSecurityLevelForUmaHistograms() override; - void HideAutofillPopup(PopupHidingReason reason) override; + void HideAutofillSuggestions(SuggestionHidingReason reason) override; bool IsAutocompleteEnabled() const override; void DidFillOrPreviewField(const std::u16string& autofilled_value, const std::u16string& profile_full_name) override; - void ConfirmMigrateLocalCardToCloud( - const LegalMessageLines& legal_message_lines, - const std::string& user_email, - const std::vector& migratable_credit_cards, - LocalCardMigrationCallback start_migrating_cards_callback) override; void ShowWebauthnOfferDialog( WebauthnDialogCallback offer_dialog_callback) override; void ShowWebauthnVerifyPendingDialog( WebauthnDialogCallback verify_pending_dialog_callback) override; void UpdateWebauthnOfferDialogWithError() override; bool CloseWebauthnDialog() override; - void OfferVirtualCardOptions( - const std::vector& candidates, - base::OnceCallback callback) override; - void CreditCardUploadCompleted(bool card_saved) override; - void PinPopupView() override; - PopupOpenArgs GetReopenPopupArgs( - AutofillSuggestionTriggerSource trigger_source) const override; - std::vector GetPopupSuggestions() const override; + void PinAutofillSuggestions() override; void UpdatePopup(const std::vector& suggestions, - PopupType popup_type, + FillingProduct main_filling_product, AutofillSuggestionTriggerSource trigger_sources) override; const GURL& GetLastCommittedPrimaryMainFrameURL() const override; const translate::LanguageState* GetLanguageState() override; @@ -128,9 +106,8 @@ class AutofillClientEfl : public ContentAutofillClient, const AutofillProfile* original_profile, AutofillClient::SaveAddressProfilePromptOptions options, AddressProfileSavePromptCallback callback) override; - payments::PaymentsClient* GetPaymentsClient() override; + payments::PaymentsAutofillClient* GetPaymentsAutofillClient() override; url::Origin GetLastCommittedPrimaryMainFrameOrigin() const override; - bool IsTouchToFillCreditCardSupported() override { return false; } bool ShowTouchToFillCreditCard( base::WeakPtr delegate, base::span cards_to_suggest) override { @@ -145,8 +122,10 @@ class AutofillClientEfl : public ContentAutofillClient, // content::WebContentsObserver implementation. void PrimaryMainFrameWasResized(bool width_changed) override; void WebContentsDestroyed() override; +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup void LoadRiskData( base::OnceCallback callback) override; +#endif void ShowSavePasswordPopup( std::unique_ptr form_to_save); @@ -165,8 +144,12 @@ class AutofillClientEfl : public ContentAutofillClient, const bool has_server_error, const std::u16string& tip_message, const std::vector& migratable_credit_cards, - MigrationDeleteCardCallback delete_local_card_callback); + payments::PaymentsAutofillClient::MigrationDeleteCardCallback + delete_local_card_callback); AutocompleteHistoryManager* GetAutocompleteHistoryManager(); + std::unique_ptr CreateManager( + base::PassKey pass_key, + ContentAutofillDriver& driver) override; private: explicit AutofillClientEfl(content::WebContents* web_contents); diff --git a/tizen_src/ewk/efl_integration/browser/autofill/autofill_login_request.h b/tizen_src/ewk/efl_integration/browser/autofill/autofill_login_request.h index 97924876e29e..387b55a69a3d 100644 --- a/tizen_src/ewk/efl_integration/browser/autofill/autofill_login_request.h +++ b/tizen_src/ewk/efl_integration/browser/autofill/autofill_login_request.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/strings/utf_string_conversions.h" #include "components/password_manager/core/browser/password_form.h" -#include "components/password_manager/core/browser/password_store.h" +#include "components/password_manager/core/browser/password_store/password_store.h" namespace autofill { diff --git a/tizen_src/ewk/efl_integration/browser/autofill/autofill_request.h b/tizen_src/ewk/efl_integration/browser/autofill/autofill_request.h index fcf60585bf09..7bf9323be064 100644 --- a/tizen_src/ewk/efl_integration/browser/autofill/autofill_request.h +++ b/tizen_src/ewk/efl_integration/browser/autofill/autofill_request.h @@ -14,7 +14,7 @@ #include "autofill_login_request.h" #include "base/synchronization/waitable_event.h" #include "components/password_manager/core/browser/password_form.h" -#include "components/password_manager/core/browser/password_store.h" +#include "components/password_manager/core/browser/password_store/password_store.h" namespace autofill { diff --git a/tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.cc b/tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.cc index 474a43170197..3fac5c2b0b86 100644 --- a/tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.cc +++ b/tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.cc @@ -51,6 +51,7 @@ PersonalDataManagerFactoryEfl::PersonalDataManagerForContext( return nullptr; } +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup std::unique_ptr pdm(new PersonalDataManager( content::GetContentClientExport()->browser()->GetApplicationLocale())); manager = pdm.get(); @@ -60,6 +61,7 @@ PersonalDataManagerFactoryEfl::PersonalDataManagerForContext( nullptr); manager->AddObserver(this); personal_data_manager_id_map_.AddWithID(std::move(pdm), unique_id); +#endif return manager; } diff --git a/tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.cc b/tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.cc index 0fc3795c2f17..8e455efc8d36 100644 --- a/tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.cc @@ -8,7 +8,6 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "components/autofill/core/browser/ui/popup_item_ids.h" #include "content/browser/renderer_host/render_widget_host_view_aura.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/common/paths_efl.h" @@ -82,7 +81,7 @@ void AutofillPopupViewEfl::Show() if (autofill_popup_) evas_object_show(autofill_popup_); if (delegate_) - delegate_->OnPopupShown(); + delegate_->OnSuggestionsShown(); } void AutofillPopupViewEfl::Hide() @@ -90,7 +89,7 @@ void AutofillPopupViewEfl::Hide() if (autofill_popup_) evas_object_hide(autofill_popup_); if (delegate_) - delegate_->OnPopupHidden(); + delegate_->OnSuggestionsHidden(); } void AutofillPopupViewEfl::ShowSavePasswordPopup( @@ -238,13 +237,17 @@ void AutofillPopupViewEfl::UpdateLocation(const gfx::RectF& bounds) { } bool isAutofillSpecial(const autofill::Suggestion& suggestion) { +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup return suggestion.popup_item_id != PopupItemId::kAutocompleteEntry && suggestion.popup_item_id != PopupItemId::kDatalistEntry; +#else + return false; +#endif } void AutofillPopupViewEfl::InitFormData( - const std::vector& suggestions, - base::WeakPtr delegate){ + const std::vector& suggestions, + base::WeakPtr delegate) { values_ = suggestions; // m42 adds some "special" autofill sugesstions. // This suggestions, like list separator is not useful for us @@ -267,10 +270,12 @@ void AutofillPopupViewEfl::InitFormData( } void AutofillPopupViewEfl::AcceptSuggestion(size_t index) { +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup if (delegate_ && index < values_.size()) { delegate_->DidAcceptSuggestion(values_[index], index, autofill::AutofillSuggestionTriggerSource()); } +#endif } void AutofillPopupViewEfl::AcceptPasswordSuggestion(int option) { @@ -303,8 +308,7 @@ void AutofillPopupViewEfl::SetSelectedLine(size_t selected_line) selected_line_ = selected_line; if (delegate_) { if (selected_line_ < values_.size()) { - delegate_->DidSelectSuggestion( - values_[selected_line], autofill::AutofillSuggestionTriggerSource()); + delegate_->DidSelectSuggestion(values_[selected_line]); } else { delegate_->ClearPreviewedForm(); diff --git a/tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.h b/tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.h index d8d47cab7cc2..f9fb8ec6adf5 100644 --- a/tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.h +++ b/tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.h @@ -15,7 +15,7 @@ #include #include "base/memory/weak_ptr.h" -#include "components/autofill/core/browser/ui/autofill_popup_delegate.h" +#include "components/autofill/core/browser/ui/autofill_suggestion_delegate.h" #include "components/autofill/core/browser/ui/suggestion.h" #include "components/password_manager/core/browser/password_form_manager_for_ui.h" #include "ui/gfx/geometry/point.h" @@ -42,9 +42,8 @@ class AutofillPopupViewEfl { std::unique_ptr form_to_save); void UpdateFormDataPopup(const gfx::RectF& bounds); void UpdateLocation(const gfx::RectF& focused_element_bounds); - void InitFormData( - const std::vector& suggestions, - base::WeakPtr delegate); + void InitFormData(const std::vector& suggestions, + base::WeakPtr delegate); void AcceptSuggestion(size_t index); void AcceptPasswordSuggestion(int option); void SetSelectedLine(size_t index); @@ -62,7 +61,7 @@ class AutofillPopupViewEfl { Evas_Object* password_popup_; std::vector values_; size_t selected_line_; - base::WeakPtr delegate_; + base::WeakPtr delegate_; std::unique_ptr form_manager_; }; diff --git a/tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.cc b/tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.cc index bd928f3b83f7..e23fce227b9c 100644 --- a/tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.cc @@ -7,8 +7,6 @@ #include "base/logging.h" #include "base/time/time.h" -#include "services/device/public/cpp/geolocation/geolocation_manager.h" - namespace device { static double KilometerPerHourToMeterPerSecond(double kilometer_per_hour) { @@ -141,10 +139,8 @@ const mojom::GeopositionResult* LocationProviderEfl::GetPosition() { void LocationProviderEfl::OnPermissionGranted() { } -std::unique_ptr NewSystemLocationProvider( - scoped_refptr main_task_runner, - GeolocationManager* geolocation_manager) { - return base::WrapUnique(new LocationProviderEfl()); +std::unique_ptr NewSystemLocationProvider() { + return std::make_unique(); } } // namespace device diff --git a/tizen_src/ewk/efl_integration/browser/password_manager/password_helper_efl.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_helper_efl.cc index 2a6ed8d89fde..53667ebac21d 100644 --- a/tizen_src/ewk/efl_integration/browser/password_manager/password_helper_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/password_manager/password_helper_efl.cc @@ -9,8 +9,8 @@ #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "components/password_manager/core/browser/password_form.h" -#include "components/password_manager/core/browser/password_store.h" -#include "components/password_manager/core/browser/password_store_consumer.h" +#include "components/password_manager/core/browser/password_store/password_store.h" +#include "components/password_manager/core/browser/password_store/password_store_consumer.h" #include "url/gurl.h" using password_manager::PasswordStore; @@ -59,7 +59,7 @@ class PasswordFormRemover : public password_manager::PasswordStoreConsumer { if (store_) { for (const auto& form : results) { if (form->url == origin_) { - store_->RemoveLogin(*form); + store_->RemoveLogin(FROM_HERE, *form); break; } } @@ -98,8 +98,8 @@ void RemoveLogin(const scoped_refptr& store, void RemoveLogins(const scoped_refptr& store) { if (store.get()) { - store->RemoveLoginsCreatedBetween(base::Time(), base::Time::Max(), - base::NullCallback()); + store->RemoveLoginsCreatedBetween(FROM_HERE, base::Time(), + base::Time::Max()); } } diff --git a/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.cc index dbf1f0627afb..e8fb0194423d 100644 --- a/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.cc @@ -122,14 +122,7 @@ void PasswordManagerClientEfl::UserModifiedNonPasswordField( } void PasswordManagerClientEfl::ShowPasswordSuggestions( - ::autofill::FieldRendererId element_id, - const ::autofill::FormData& form, - uint64_t username_field_index, - uint64_t password_field_index, - ::base::i18n::TextDirection text_direction, - const ::std::u16string& typed_username, - int32_t options, - const ::gfx::RectF& bounds) { + const autofill::PasswordSuggestionRequest& request) { NOTIMPLEMENTED(); } @@ -169,6 +162,10 @@ void PasswordManagerClientEfl::NotifySuccessfulLoginWithExistingPassword( NOTIMPLEMENTED(); } +void PasswordManagerClientEfl::NotifyKeychainError() { + NOTIMPLEMENTED(); +} + void PasswordManagerClientEfl::NotifyStorePasswordCalled() { NOTIMPLEMENTED(); } @@ -376,8 +373,19 @@ const syncer::SyncService* PasswordManagerClientEfl::GetSyncService() const { return nullptr; } -PasswordChangeSuccessTracker* -PasswordManagerClientEfl::GetPasswordChangeSuccessTracker() { +affiliations::AffiliationService* +PasswordManagerClientEfl::GetAffiliationService() { + NOTIMPLEMENTED(); + return nullptr; +} + +std::unique_ptr +PasswordManagerClientEfl::ShowCrossDomainConfirmationPopup( + const gfx::RectF& element_bounds, + base::i18n::TextDirection text_direction, + const GURL& domain, + const std::u16string& password_origin, + base::OnceClosure confirmation_callback) { NOTIMPLEMENTED(); return nullptr; } diff --git a/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h index ea92baf418df..54656600c9b1 100644 --- a/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h +++ b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h @@ -16,7 +16,7 @@ #include "components/password_manager/core/browser/password_feature_manager_impl.h" #include "components/password_manager/core/browser/password_manager_client.h" #include "components/password_manager/core/browser/password_manager_metrics_recorder.h" -#include "components/password_manager/core/browser/password_store.h" +#include "components/password_manager/core/browser/password_store/password_store.h" #include "components/password_manager/core/browser/stub_credentials_filter.h" #include "content/public/browser/render_frame_host_receiver_set.h" #include "content/public/browser/web_contents_user_data.h" @@ -67,14 +67,8 @@ class PasswordManagerClientEfl const ::std::u16string& value, bool autocomplete_attribute_has_username, bool is_likely_otp) override; - void ShowPasswordSuggestions(::autofill::FieldRendererId element_id, - const ::autofill::FormData& form, - uint64_t username_field_index, - uint64_t password_field_index, - ::base::i18n::TextDirection text_direction, - const ::std::u16string& typed_username, - int32_t options, - const ::gfx::RectF& bounds) override; + void ShowPasswordSuggestions( + const autofill::PasswordSuggestionRequest& request) override; bool PromptUserToChooseCredentials( std::vector> local_forms, const url::Origin& origin, @@ -87,6 +81,7 @@ class PasswordManagerClientEfl void NotifySuccessfulLoginWithExistingPassword( std::unique_ptr submitted_manager) override; + void NotifyKeychainError() override; void NotifyStorePasswordCalled() override; void AutomaticPasswordSave( std::unique_ptr saved_form_manager, @@ -135,7 +130,7 @@ class PasswordManagerClientEfl } PrefService* GetLocalStatePrefs() const override; const syncer::SyncService* GetSyncService() const override; - PasswordChangeSuccessTracker* GetPasswordChangeSuccessTracker() override; + affiliations::AffiliationService* GetAffiliationService() override; private: explicit PasswordManagerClientEfl(content::WebContents* web_contents, @@ -168,6 +163,14 @@ class PasswordManagerClientEfl void CheckSafeBrowsingReputation(const GURL& form_action, const GURL& frame_url) override; + std::unique_ptr + ShowCrossDomainConfirmationPopup( + const gfx::RectF& element_bounds, + base::i18n::TextDirection text_direction, + const GURL& domain, + const std::u16string& password_origin, + base::OnceClosure confirmation_callback) override; + password_manager::PasswordManager* GetPasswordManager(); gfx::RectF TransformToRootCoordinates( diff --git a/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.cc index 123e6c468101..cbbe3ee94d1a 100644 --- a/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.cc +++ b/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.cc @@ -13,9 +13,9 @@ #include "base/path_service.h" #include "browser/webdata/web_data_service.h" #include "browser/webdata/web_data_service_factory.h" -#include "components/password_manager/core/browser/login_database.h" -#include "components/password_manager/core/browser/password_store.h" -#include "components/password_manager/core/browser/password_store_built_in_backend.h" +#include "components/password_manager/core/browser/password_store/login_database.h" +#include "components/password_manager/core/browser/password_store/password_store.h" +#include "components/password_manager/core/browser/password_store/password_store_built_in_backend.h" #include "components/sync/model/syncable_service.h" #include "content/common/paths_efl.h" #include "content/public/browser/browser_thread.h" @@ -67,7 +67,8 @@ void PasswordStoreFactory::Init() { scoped_refptr ps = new password_manager::PasswordStore( std::make_unique( - std::move(login_db), syncer::WipeModelUponSyncDisabledBehavior())); + std::move(login_db), syncer::WipeModelUponSyncDisabledBehavior(), + nullptr)); if (!ps.get()) { LOG(ERROR) << "Could not create password manager."; diff --git a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc index e64e4560f3db..f4ebaa40ebd6 100644 --- a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc +++ b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc @@ -12,7 +12,6 @@ #include "base/path_service.h" #include "base/task/thread_pool.h" #include "components/autofill/core/browser/geo/autofill_country.h" -#include "components/autofill/core/browser/webdata/autofill_table.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/webdata/common/webdata_constants.h" #include "content/common/paths_efl.h" @@ -59,7 +58,9 @@ WebDataServiceWrapperEfl::WebDataServiceWrapperEfl() { // All tables objects that participate in managing the database must // be added here. +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup web_database_->AddTable(base::WrapUnique(new autofill::AutofillTable)); +#endif web_database_->LoadDatabase(); autofill_web_data_ = diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc index f246889f9fb8..0a517f68263b 100644 --- a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc +++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc @@ -514,9 +514,9 @@ bool ContentBrowserClientEfl::BindAssociatedReceiverFromFrame( if (interface_name == autofill::mojom::AutofillDriver::Name_) { autofill::ContentAutofillDriverFactory::BindAutofillDriver( + render_frame_host, mojo::PendingAssociatedReceiver( - std::move(*handle)), - render_frame_host); + std::move(*handle))); return true; } #endif @@ -668,7 +668,7 @@ void ContentBrowserClientEfl::ExposeInterfacesToRenderer( switches::kXWalkExtensionPath)) { return; } -#if BUILDFLAG(IS_TIZEN) +#if BUILDFLAG(IS_TIZEN) && !defined(EWK_BRINGUP) // FIXME: m126 bringup registry->AddInterface( base::BindRepeating(&wrt::XWalkExtensionManager::Bind), content::GetUIThreadTaskRunner({})); diff --git a/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc b/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc index 9dd2f300b894..333ac6f6f193 100644 --- a/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc @@ -152,6 +152,7 @@ ContentBrowserClient* ContentMainDelegateEfl::GetContentBrowserClient() const { #if BUILDFLAG(IS_TIZEN) void ContentMainDelegateEfl::InitializeXWalkExtensions( const std::string& extension_path) { +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup auto* extension_manager = wrt::XWalkExtensionManager::GetInstance(); if (extension_manager->HasDelegate()) return; @@ -159,6 +160,7 @@ void ContentMainDelegateEfl::InitializeXWalkExtensions( extension_manager->LoadExtensionsByPath(extension_path); extension_manager->PreloadExtensions(); extension_manager->SetDelegate(std::make_unique()); +#endif } #endif /* LCOV_EXCL_STOP */ diff --git a/tizen_src/ewk/efl_integration/private/ewk_context_form_autofill_profile_private.cc b/tizen_src/ewk/efl_integration/private/ewk_context_form_autofill_profile_private.cc index f0fbcdb039f0..4c0d4828e9d3 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_context_form_autofill_profile_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_context_form_autofill_profile_private.cc @@ -59,8 +59,9 @@ bool IsValidEwkGUID(const std::string& guid) { } } -static std::map create_EWK_to_Autofill_profile_map() { - std::map profile_map; +static std::map +create_EWK_to_Autofill_profile_map() { + std::map profile_map; profile_map[PROFILE_NAME] = autofill::NAME_FULL; profile_map[PROFILE_COMPANY] = autofill::COMPANY_NAME; profile_map[PROFILE_ADDRESS1] = autofill::ADDRESS_HOME_LINE1; @@ -78,7 +79,7 @@ void to_Autofill_Profile_set_data(const Ewk_Autofill_Profile* oldStyleProfile, DataType DataName, std::string locale, autofill::AutofillProfile &ret) { - static std::map profile_map = + static std::map profile_map = create_EWK_to_Autofill_profile_map(); if (profile_map.find(DataName) == profile_map.end()) { return; @@ -96,7 +97,9 @@ void to_Autofill_Profile_set_data(const Ewk_Autofill_Profile* oldStyleProfile, autofill::AutofillProfile to_Autofill_Profile( const Ewk_Autofill_Profile* oldStyleProfile) { std::string locale = EWebView::GetPlatformLocale(); - autofill::AutofillProfile ret(locale); + autofill::AutofillProfile ret( + locale, autofill::AutofillProfile::Source::kLocalOrSyncable, + autofill::i18n_model_definition::kLegacyHierarchyCountryCode); if (!oldStyleProfile) return ret; @@ -125,23 +128,25 @@ autofill::AutofillProfile to_Autofill_Profile( return ret; } -static std::map +static std::map create_Autofill_to_EWK_profile_map() { - std::map profile_map; - std::map autofill_map = + std::map profile_map; + std::map autofill_map = create_EWK_to_Autofill_profile_map(); - for (std::map::iterator it = - autofill_map.begin(); it!=autofill_map.end(); ++it) + for (std::map::iterator it = + autofill_map.begin(); + it != autofill_map.end(); ++it) { profile_map[it->second] = it->first; + } return profile_map; } void to_EWK_Profile_set_data(const autofill::AutofillProfile& newStyleProfile, - autofill::ServerFieldType DataName, - std::string locale, - Ewk_Autofill_Profile* ret) { + autofill::FieldType DataName, + std::string locale, + Ewk_Autofill_Profile* ret) { std::u16string value; - static std::map profile_map = + static std::map profile_map = create_Autofill_to_EWK_profile_map(); if (DataName == autofill::NAME_FULL || DataName == autofill::ADDRESS_HOME_COUNTRY) { @@ -205,9 +210,10 @@ EwkContextFormAutofillProfileManager::priv_form_autofill_profile_get_all( PersonalDataManagerForEWKContext(ewk_context); DCHECK(manager); + Eina_List* list = nullptr; +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup std::vector dataVector = manager->GetProfiles(); - Eina_List* list = nullptr; for (unsigned i = 0; i < dataVector.size(); ++i) { autofill::AutofillProfile* profile = dataVector[i]; if (profile) { @@ -216,6 +222,7 @@ EwkContextFormAutofillProfileManager::priv_form_autofill_profile_get_all( list = eina_list_append(list, p); } } +#endif return list; } @@ -228,11 +235,13 @@ EwkContextFormAutofillProfileManager::priv_form_autofill_profile_get( PersonalDataManagerForEWKContext(ewk_context); DCHECK(manager); + Ewk_Autofill_Profile* ret = nullptr; +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup autofill::AutofillProfile* profile = manager->GetProfileByGUID(UnsignedToGUID(id)); - Ewk_Autofill_Profile* ret = nullptr; if (profile) ret = to_Ewk_Autofill_Profile(*profile); +#endif return ret; } @@ -245,11 +254,13 @@ Eina_Bool EwkContextFormAutofillProfileManager::priv_form_autofill_profile_set( PersonalDataManagerForEWKContext(ewk_context); DCHECK(manager); +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup autofill::AutofillProfile* profile = manager->GetProfileByGUID(UnsignedToGUID(id)); if (profile) manager->UpdateProfile(to_Autofill_Profile(ewk_profile)); else manager->AddProfile(to_Autofill_Profile(ewk_profile)); +#endif return EINA_TRUE; } @@ -261,7 +272,9 @@ Eina_Bool EwkContextFormAutofillProfileManager::priv_form_autofill_profile_add( PersonalDataManagerForEWKContext(ewk_context); DCHECK(manager); +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup manager->AddProfile(to_Autofill_Profile(profile)); +#endif return EINA_TRUE; } diff --git a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc index 3d86750fe7f3..23834c5310cf 100644 --- a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc @@ -69,12 +69,6 @@ #include "renderer/plugins/plugin_placeholder_hole.h" #endif -#if defined(TIZEN_AUTOFILL) -using autofill::AutofillAgent; -using autofill::PasswordAutofillAgent; -using autofill::PasswordGenerationAgent; -#endif - #if defined(TIZEN_PEPPER_EXTENSIONS) #include "common/trusted_pepper_plugin_info_cache.h" #include "common/trusted_pepper_plugin_util.h" @@ -84,6 +78,14 @@ using autofill::PasswordGenerationAgent; #include "renderer/pepper/pepper_helper.h" #endif +#if defined(TIZEN_AUTOFILL) +using autofill::AutofillAgent; +using autofill::PasswordAutofillAgent; +using autofill::PasswordGenerationAgent; +using EnableHeavyFormDataScraping = + autofill::PasswordAutofillAgent::EnableHeavyFormDataScraping; +#endif + // Chromium-efl deliberately uses a different value than // default_maximum_page_scale_factor (4.0) because it has shown // better empirical results. @@ -192,11 +194,13 @@ void ContentRendererClientEfl::RenderFrameCreated(content::RenderFrame* render_f render_frame_observer->associated_interfaces(); std::unique_ptr password_autofill_agent = - std::make_unique(render_frame, registry); + std::make_unique( + render_frame, registry, EnableHeavyFormDataScraping(false)); std::unique_ptr password_generation_agent = std::make_unique( render_frame, password_autofill_agent.get(), registry); - new AutofillAgent(render_frame, std::move(password_autofill_agent), + new AutofillAgent(render_frame, /* config= */ AutofillAgent::Config{}, + std::move(password_autofill_agent), std::move(password_generation_agent), registry); } #endif @@ -277,7 +281,7 @@ void ContentRendererClientEfl::DidCreateScriptContext( content::RenderFrame* render_frame, v8::Handle context, int world_id) { -#if BUILDFLAG(IS_TIZEN) +#if BUILDFLAG(IS_TIZEN) && !defined(EWK_BRINGUP) // FIXME: m126 bringup if (ShouldRegisterXWalkExtension(world_id)) wrt::XWalkExtensionRendererController::DidCreateScriptContext(context); #endif @@ -309,7 +313,7 @@ void ContentRendererClientEfl::WillReleaseScriptContext( blink::WebFrame* frame, v8::Handle context, int world_id) { -#if BUILDFLAG(IS_TIZEN) +#if BUILDFLAG(IS_TIZEN) && !defined(EWK_BRINGUP) // FIXME: m126 bringup if (ShouldRegisterXWalkExtension(world_id)) wrt::XWalkExtensionRendererController::WillReleaseScriptContext(context); #endif diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc index e2f9bb308a32..8891800a89de 100644 --- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc @@ -327,6 +327,7 @@ void WebContentsDelegateEfl::RequestMediaAccessAllow( blink::mojom::StreamDevices& stream_devices = *stream_devices_set.stream_devices[0]; +#if !defined(EWK_BRINGUP) // FIXME: m126 bringup if (request.audio_type == blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) { const blink::MediaStreamDevice* audio_device = @@ -356,6 +357,7 @@ void WebContentsDelegateEfl::RequestMediaAccessAllow( return; } } +#endif std::move(callback).Run(stream_devices_set, blink::mojom::MediaStreamRequestResult::OK, @@ -373,7 +375,7 @@ void WebContentsDelegateEfl::RequestMediaAccessDeny( bool WebContentsDelegateEfl::CheckMediaAccessPermission( RenderFrameHost* render_frame_host, - const GURL& security_origin, + const url::Origin& security_origin, blink::mojom::MediaStreamType type) { return true; } diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h index 51edfbfe6c7e..f6c706d823dd 100644 --- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h @@ -140,7 +140,7 @@ class WebContentsDelegateEfl : public WebContentsDelegate { #if defined(TIZEN_MULTIMEDIA) bool CheckMediaAccessPermission(RenderFrameHost* render_frame_host, - const GURL& security_origin, + const url::Origin& security_origin, blink::mojom::MediaStreamType type) override; void RequestMediaAccessPermission(WebContents* web_contents, diff --git a/ui/accessibility/platform/ax_platform_tree_manager_delegate.h b/ui/accessibility/platform/ax_platform_tree_manager_delegate.h index f0c05b32c23c..294bf062fd14 100644 --- a/ui/accessibility/platform/ax_platform_tree_manager_delegate.h +++ b/ui/accessibility/platform/ax_platform_tree_manager_delegate.h @@ -17,6 +17,9 @@ namespace content { class WebContentsAccessibility; +#if defined(TIZEN_ATK_SUPPORT) +class RenderWidgetHostView; +#endif } namespace ui { @@ -132,6 +135,10 @@ class COMPONENT_EXPORT(AX_PLATFORM) AXPlatformTreeManagerDelegate { virtual content::WebContentsAccessibility* AccessibilityGetWebContentsAccessibility() = 0; +#if defined(TIZEN_ATK_SUPPORT) + virtual content::RenderWidgetHostView* AccessibilityGetView() = 0; +#endif + protected: AXPlatformTreeManagerDelegate() = default; }; diff --git a/wrt/BUILD.gn b/wrt/BUILD.gn index 2c972389c8bb..8db427ee7cba 100644 --- a/wrt/BUILD.gn +++ b/wrt/BUILD.gn @@ -36,56 +36,49 @@ buildflag_header("buildflags") { } webpack_build("electron_asar_bundle") { - inputs = rebase_path( - auto_filenames.asar_bundle_deps, ".", "//electron") + inputs = rebase_path(auto_filenames.asar_bundle_deps, ".", "//electron") config_file = "//electron/build/webpack/webpack.config.asar.js" out_file = "$root_gen_dir/electron/js2c/asar_bundle.js" } webpack_build("electron_browser_bundle") { - inputs = rebase_path( - auto_filenames.browser_bundle_deps, ".", "//electron") + inputs = rebase_path(auto_filenames.browser_bundle_deps, ".", "//electron") config_file = "//electron/build/webpack/webpack.config.browser.js" out_file = "$root_gen_dir/electron/js2c/browser_init.js" } webpack_build("electron_renderer_bundle") { - inputs = rebase_path( - auto_filenames.renderer_bundle_deps, ".", "//electron") + inputs = rebase_path(auto_filenames.renderer_bundle_deps, ".", "//electron") config_file = "//electron/build/webpack/webpack.config.renderer.js" out_file = "$root_gen_dir/electron/js2c/renderer_init.js" } webpack_build("electron_worker_bundle") { - inputs = rebase_path( - auto_filenames.worker_bundle_deps, ".", "//electron") + inputs = rebase_path(auto_filenames.worker_bundle_deps, ".", "//electron") config_file = "//electron/build/webpack/webpack.config.worker.js" out_file = "$root_gen_dir/electron/js2c/worker_init.js" } webpack_build("electron_sandboxed_renderer_bundle") { - inputs = rebase_path( - auto_filenames.sandbox_bundle_deps, ".", "//electron") + inputs = rebase_path(auto_filenames.sandbox_bundle_deps, ".", "//electron") config_file = "//electron/build/webpack/webpack.config.sandboxed_renderer.js" out_file = "$root_gen_dir/electron/js2c/sandbox_bundle.js" } webpack_build("electron_isolated_renderer_bundle") { - inputs = rebase_path( - auto_filenames.isolated_bundle_deps, ".", "//electron") + inputs = rebase_path(auto_filenames.isolated_bundle_deps, ".", "//electron") config_file = "//electron/build/webpack/webpack.config.isolated_renderer.js" out_file = "$root_gen_dir/electron/js2c/isolated_bundle.js" } webpack_build("electron_utility_bundle") { - inputs = rebase_path( - auto_filenames.utility_bundle_deps, ".", "//electron") + inputs = rebase_path(auto_filenames.utility_bundle_deps, ".", "//electron") config_file = "//electron/build/webpack/webpack.config.utility.js" out_file = "$root_gen_dir/electron/js2c/utility_init.js" @@ -203,9 +196,7 @@ action("electron_generate_node_defines") { grit("wrt_resources") { source = "//wrt/wrt_resources.grd" - defines = [ - "enable_extensions=$enable_chrome_extensions", - ] + defines = [ "enable_extensions=$enable_chrome_extensions" ] outputs = [ "grit/wrt_resources.h", "wrt_resources.pak", @@ -239,9 +230,7 @@ repack("wrt_packed_resources") { mojom("mojo_bindings") { cpp_only = true - sources = [ - "src/common/wrt.mojom", - ] + sources = [ "src/common/wrt.mojom" ] public_deps = [ "//mojo/public/mojom/base", "//ui/gfx/geometry/mojom", @@ -388,49 +377,47 @@ static_library("wrt_lib") { } sources = wrt_lib_sources + [ - "//chrome/browser/app_mode/app_mode_utils.cc", - "//chrome/browser/app_mode/app_mode_utils.h", - "//chrome/browser/browser_features.cc", - "//chrome/browser/browser_features.h", - "//chrome/browser/browser_process.cc", - "//chrome/browser/browser_process.h", - "//chrome/browser/devtools/devtools_contents_resizing_strategy.cc", - "//chrome/browser/devtools/devtools_contents_resizing_strategy.h", - "//chrome/browser/devtools/devtools_embedder_message_dispatcher.cc", - "//chrome/browser/devtools/devtools_embedder_message_dispatcher.h", - "//chrome/browser/devtools/devtools_file_system_indexer.cc", - "//chrome/browser/devtools/devtools_file_system_indexer.h", - "//chrome/browser/icon_loader.cc", - "//chrome/browser/icon_loader.h", - "//chrome/browser/icon_loader_auralinux.cc", - "//chrome/browser/icon_manager.cc", - "//chrome/browser/icon_manager.h", - "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc", - "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h", - "//chrome/browser/net/proxy_config_monitor.cc", - "//chrome/browser/net/proxy_config_monitor.h", - "//chrome/browser/net/proxy_service_factory.cc", - "//chrome/browser/net/proxy_service_factory.h", - "//chrome/browser/process_singleton.h", - "//chrome/browser/process_singleton_posix.cc", - "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc", - "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h", - "//chrome/browser/ui/exclusive_access/exclusive_access_manager.cc", - "//chrome/browser/ui/exclusive_access/exclusive_access_manager.h", - "//chrome/browser/ui/exclusive_access/fullscreen_controller.cc", - "//chrome/browser/ui/exclusive_access/fullscreen_controller.h", - "//chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.cc", - "//chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h", - "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc", - "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h", - "//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc", - "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h", - "//electron/shell/browser/certificate_manager_model.cc", - "//electron/shell/browser/certificate_manager_model.h", - "//electron/shell/browser/lib/power_observer_linux.cc", - "//electron/shell/browser/relauncher_linux.cc", - "//electron/shell/common/node_bindings_linux.cc", - ] + "//chrome/browser/app_mode/app_mode_utils.cc", + "//chrome/browser/app_mode/app_mode_utils.h", + "//chrome/browser/browser_features.cc", + "//chrome/browser/browser_features.h", + "//chrome/browser/browser_process.cc", + "//chrome/browser/browser_process.h", + "//chrome/browser/devtools/devtools_contents_resizing_strategy.cc", + "//chrome/browser/devtools/devtools_contents_resizing_strategy.h", + "//chrome/browser/devtools/devtools_embedder_message_dispatcher.cc", + "//chrome/browser/devtools/devtools_embedder_message_dispatcher.h", + "//chrome/browser/devtools/devtools_file_system_indexer.cc", + "//chrome/browser/devtools/devtools_file_system_indexer.h", + "//chrome/browser/icon_loader.cc", + "//chrome/browser/icon_loader.h", + "//chrome/browser/icon_loader_auralinux.cc", + "//chrome/browser/icon_manager.cc", + "//chrome/browser/icon_manager.h", + "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc", + "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h", + "//chrome/browser/net/proxy_config_monitor.cc", + "//chrome/browser/net/proxy_config_monitor.h", + "//chrome/browser/net/proxy_service_factory.cc", + "//chrome/browser/net/proxy_service_factory.h", + "//chrome/browser/process_singleton.h", + "//chrome/browser/process_singleton_posix.cc", + "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc", + "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h", + "//chrome/browser/ui/exclusive_access/exclusive_access_manager.cc", + "//chrome/browser/ui/exclusive_access/exclusive_access_manager.h", + "//chrome/browser/ui/exclusive_access/fullscreen_controller.cc", + "//chrome/browser/ui/exclusive_access/fullscreen_controller.h", + "//chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.cc", + "//chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h", + "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc", + "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h", + "//electron/shell/browser/certificate_manager_model.cc", + "//electron/shell/browser/certificate_manager_model.h", + "//electron/shell/browser/lib/power_observer_linux.cc", + "//electron/shell/browser/relauncher_linux.cc", + "//electron/shell/common/node_bindings_linux.cc", + ] sources += rebase_path(electron_override_sources, ".", "overrides/electron") if (tizen_product_tv) { sources += wrt_lib_sources_tv @@ -534,24 +521,25 @@ static_library("wrt_lib") { } } - unused_electron_sources = [ - "shell/browser/api/electron_api_desktop_capturer.cc", - "shell/browser/api/electron_api_global_shortcut.cc", - "shell/browser/api/electron_api_native_theme.cc", - "shell/browser/api/electron_api_safe_storage.cc", - "shell/browser/electron_autofill_driver.cc", - "shell/browser/electron_autofill_driver_factory.cc", - "shell/browser/osr/osr_host_display_client.cc", - "shell/browser/osr/osr_render_widget_host_view.cc", - "shell/browser/osr/osr_video_consumer.cc", - "shell/browser/osr/osr_view_proxy.cc", - "shell/browser/osr/osr_web_contents_view.cc", - "shell/browser/plugins/plugin_utils.cc", - "shell/browser/ui/autofill_popup.cc", - "shell/browser/ui/webui/accessibility_ui.cc", - "shell/renderer/api/electron_api_spell_check_client.cc", - "shell/renderer/electron_autofill_agent.cc", - ] + electron_override_sources + unused_electron_sources = + [ + "shell/browser/api/electron_api_desktop_capturer.cc", + "shell/browser/api/electron_api_global_shortcut.cc", + "shell/browser/api/electron_api_native_theme.cc", + "shell/browser/api/electron_api_safe_storage.cc", + "shell/browser/electron_autofill_driver.cc", + "shell/browser/electron_autofill_driver_factory.cc", + "shell/browser/osr/osr_host_display_client.cc", + "shell/browser/osr/osr_render_widget_host_view.cc", + "shell/browser/osr/osr_video_consumer.cc", + "shell/browser/osr/osr_view_proxy.cc", + "shell/browser/osr/osr_web_contents_view.cc", + "shell/browser/plugins/plugin_utils.cc", + "shell/browser/ui/autofill_popup.cc", + "shell/browser/ui/webui/accessibility_ui.cc", + "shell/renderer/api/electron_api_spell_check_client.cc", + "shell/renderer/electron_autofill_agent.cc", + ] + electron_override_sources electron_sources = filenames.lib_sources + filenames.lib_sources_posix if (enable_chrome_extensions) { @@ -579,13 +567,11 @@ static_library("wrt_lib") { executable("wrt") { testonly = true - deps = [ - "//tizen_src/ewk/efl_integration:libchromium-ewk", - ] + deps = [ "//tizen_src/ewk/efl_integration:libchromium-ewk" ] sources = [ "src/app/wrt_main.cc" ] ldflags = [ "-pie", - "-Wl,--export-dynamic" + "-Wl,--export-dynamic", ] cflags = [ "-fPIC" ] if (is_tizen) { @@ -594,13 +580,9 @@ executable("wrt") { } shared_library("wrt-service-override") { - sources = [ - "src/common/wrt_service_override.cc" - ] + sources = [ "src/common/wrt_service_override.cc" ] libs = [ "dlog" ] - ldflags = [ - "-Wl,--export-dynamic" - ] + ldflags = [ "-Wl,--export-dynamic" ] cflags = [ "-fPIC" ] } @@ -608,7 +590,7 @@ executable("wrt-service") { testonly = true deps = [ ":wrt-service-override", - "//tizen_src/ewk/efl_integration:libchromium-ewk" + "//tizen_src/ewk/efl_integration:libchromium-ewk", ] sources = [ "src/app/service_main.cc",