[M126][Tizen][Offscreen] Fix build errors for tizen standard profile 10/315610/17
authorv-saha <v.saha@samsung.com>
Mon, 12 Aug 2024 10:35:38 +0000 (16:05 +0530)
committerInsoon Kim <is46.kim@samsung.com>
Tue, 20 Aug 2024 10:41:24 +0000 (10:41 +0000)
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 <c.padhi@samsung.com>
Signed-off-by: v-saha <v.saha@samsung.com>
Signed-off-by: uzair <uzair.jaleel@samsung.com>
61 files changed:
base/BUILD.gn
base/logging.cc
build/config/c++/c++.gni
cc/test/render_pass_test_utils.cc
components/components_strings.grd
components/crash/core/common/BUILD.gn
components/enterprise/buildflags/buildflags.gni
components/system_cpu/BUILD.gn
content/browser/interest_group/storage_interest_group.h
content/browser/renderer_host/render_view_host_impl.h
content/common/features.gni
content/gpu/BUILD.gn
content/public/browser/speech_recognition_manager_delegate.h
content/renderer/accessibility/render_accessibility_impl.cc
electron/chromium_src/BUILD.gn
media/filters/demuxer_manager.cc
packaging/chromium-efl.spec
services/device/geolocation/location_arbitrator.cc
services/network/network_context.cc
services/network/network_context.h
services/on_device_model/BUILD.gn
third_party/blink/renderer/core/loader/frame_loader.cc
third_party/blink/renderer/modules/mediastream/user_media_processor.cc
third_party/blink/renderer/modules/mediastream/web_media_player_ms_compositor.h
third_party/dawn/scripts/dawn_component.gni
third_party/dawn/scripts/dawn_features.gni
tizen_src/build/common.sh
tizen_src/build/config/compiler/BUILD.gn
tizen_src/build/config/tizen_features.gni
tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc
tizen_src/chromium_impl/content/browser/speech/tizen_speech_recognition_manager_delegate.h
tizen_src/chromium_impl/content/renderer/media/tizen/media_player_renderer_client.cc
tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.cc
tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.h
tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc
tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_efl.cc
tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_efl.h
tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_provider_efl.cc
tizen_src/chromium_impl/services/device/generic_sensor/platform_sensor_provider_efl.h
tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl_wayland.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/autofill_login_request.h
tizen_src/ewk/efl_integration/browser/autofill/autofill_request.h
tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.cc
tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.cc
tizen_src/ewk/efl_integration/browser/autofill_popup_view_efl.h
tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.cc
tizen_src/ewk/efl_integration/browser/password_manager/password_helper_efl.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/password_manager/password_store_factory.cc
tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc
tizen_src/ewk/efl_integration/content_browser_client_efl.cc
tizen_src/ewk/efl_integration/content_main_delegate_efl.cc
tizen_src/ewk/efl_integration/private/ewk_context_form_autofill_profile_private.cc
tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
ui/accessibility/platform/ax_platform_tree_manager_delegate.h
wrt/BUILD.gn

index 32fc6da29ba8c1c98116380c086a558e8eabadef..4fb12d33398587541c7ea6ac39c6f5d4713cee93 100644 (file)
@@ -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.
index 2546634d0c5330afb2942b34dddd647c398d6515..9383cb644aefa11d2bef9160e662aefbe1047905 100644 (file)
@@ -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;
     }
index e7bf4cd86f413929dca48c18516dfc42f74f04df..6a2c3c65e8c39d21bc30bbdbcb8a44a608cb2930 100644 (file)
@@ -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
index 4964732803f3250bcf9401d246647535b62ee065..51c198228be329075dd08839b915aa8d18ce92d3 100644 (file)
@@ -511,6 +511,9 @@ std::unique_ptr<viz::AggregatedRenderPass> 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);
index f0ade3fac316070cbb23f48b9ba30de2347d9c90..05c39e8c444fce83a6700d8c5a2c559678577638 100644 (file)
         <part file="webxr_strings.grdp" />
       </if>
 
-      <if expr="not is_tizen">
       <!-- Generic terms -->
       <message name="IDS_CANCEL" desc="Used for Cancel on buttons">
         Cancel
       <message name="IDS_CLEAR" desc="A generic term for Clearing input fields." formatter_data="android_java">
         Clear
       </message>
-      </if>
       <message name="IDS_CLOSE" desc="A generic term for Close on buttons and menus.">
         Close
       </message>
index 2082077c2e029c471b9e3f5c3a7661896bbcb750..aae97a2cd4a5443bbe58d6657223491ee9b9df47 100644 (file)
@@ -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") {
index 7a155bd2ffc4521983fb310f0c5a93710eca6157..96c604a8510c946024ac48afab9c1a380aa7caf2 100644 (file)
@@ -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 =
index dd7e851dea6b7e51a1c0bf22278ef5b0f0d4f961..05a4ae0de149f9763199d446c0f1a665b9d182fd 100644 (file)
@@ -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",
index 2c783a97c6b8db88363cab9e6470a0089ff6a71d..7a06ae22dd323e341a17cdd8a76e95f3675ef9da 100644 (file)
@@ -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;
index 5b4e90e2a9293f6d59e92b16bd461500f8188cc7..0fa51581eb549ab4fbf728e913b42b4d3954fba3 100644 (file)
@@ -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
index ea3675d6b5eebe44ecc6d7467939ab5cfe9ab0b7..811a61a6eeb2adbcdcce918deaf608041bc1bde1 100644 (file)
@@ -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
index dd4182b68194b8167462359431a758afda574d2d..56107bd0cb6f47578d6c8a53f1472460e1c74bee 100644 (file)
@@ -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",
index bd9ce9e8d8d93b2487f467db2f5349fd85135ec1..c97f5a356c330dd508c63b0ec44c5e60c10c2657 100644 (file)
@@ -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 {
index 62e80416fdced3c5cb740bef5fe88c1dd15e7695..df90a775a8bd2f32892f14b6e282530ecded685b 100644 (file)
@@ -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)
index e0471b1b3fce59b7b2ae13c1be9710362611736e..9280b99a56b5134763a76999082eadcc6f5b590a 100644 (file)
@@ -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",
index 759c851d436a0f895f11ded9b3c195d84053d8da..9f02488c57f5976347891e870e9556f702c45aa2 100644 (file)
@@ -644,7 +644,13 @@ std::unique_ptr<Demuxer> DemuxerManager::CreateMediaUrlDemuxer(
   std::unique_ptr<MediaUrlDemuxer> media_url_demuxer =
       std::make_unique<MediaUrlDemuxer>(
           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;
index 07a9f5cef0122e367602a5b82be2b263a2063abd..d56f900bfdb68a79f72dd238ac0a5d8474e21a87 100644 (file)
@@ -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
index 7121e759847ff33c7680894dd23673b3c763ae05..107db8b769686a553a22bfa5a8d263080dc8d43c 100644 (file)
@@ -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
 
index df4acfedf70e5d2e08ad89d512244650e4ec15b7..907922a68f578a267882965d79cf99daedfa597e 100644 (file)
@@ -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_) {
index 2cc1481366c050e63c113cab5d18ca18d33e86f6..1e20f2d057cb1b5bddb8d52411165db9c6134404 100644 (file)
@@ -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:
index aec84d706d3dd6137c2b4f27a3f652cf7c130fbc..68ba63b09838615c4fedcfd664a400935935bc62 100644 (file)
@@ -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",
index 07c4cf6b137e36877ef68ae5cbe944b1f13408ab..41a8f3a5a506482f32dcc6c72049f9b278b61673 100644 (file)
@@ -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;
 
index dbc240c6eee6b7d35fb7f2078b73f918947d2069..4b939bbf8940fb65d5245d77a645359eafba0978 100644 (file)
@@ -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
index bca5dd6d152073a0ff5754ccb89b9a194086c8a1..9eab43af4262b7f70f4e4f6cbe940ff8ff501aa3 100644 (file)
@@ -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();
index ffbfcc4f99ea843351747911bc1c1d8bd88626a8..79d1dbc603867fd314ee9d97cd3c5a6f03d8b58a 100644 (file)
@@ -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
index 11d25c14aa152a312ecc2a94b850a0130e515db3..a471132188659c338268bffd1ee2198a0118a2f4 100644 (file)
@@ -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.
index c0b3c3301d9dd5698cdf549ef639793c763a4d3e..34f2dea0f68357f0b795ff12f78a6f5ab819a7e9 100755 (executable)
@@ -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
index b89e9e0271c435e8f7c72a32f96bdd6fe62c3af5..b484dc3470433df226c148c12f5633bacfd9c19e 100644 (file)
@@ -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" ]
     }
   }
 }
index afc058c1150c939974a5769e8c1c3e71ebcb1562..ec4f50e7cffa2c4b2ff5a60817a11a6957792d44 100644 (file)
@@ -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
index a0f435c41a6eaea37da4c430ad54cc4bc13955e3..60078d161366473a8a7d649eb73da4a3e7a4600b 100644 (file)
@@ -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() {
index f435984f77ba453be22117fc9e5bcdddedcb238d..b1b89c9550ccf91aa9bb9919ee5a0e632ab493a7 100644 (file)
@@ -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<media::mojom::SpeechRecognitionContext> receiver)
+      override {}
 };
 
 }  // namespace content
index 988f07ad2ffb77fd63ef567fdb59a4510f0c6655..6e076df6bb45289ce58b273e2a14d5b7b31e18e2 100644 (file)
@@ -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));
 }
 
index 729eff05605be643ffaffc728faf4182a9dd2691..d2ca02a82df8da623dd68302f86a067549ebdb84 100644 (file)
@@ -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_);
index f10a00b434bfb6eedd06176a85871782de90d4a8..9c5d3da7ab6e1938bf432562267b437fc965de95 100644 (file)
@@ -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"
 
index 9c7290d32aec06319dc969660d5064a8d9def57d..e8f6de108f4c3811094c74ae38ab8e2d0e9a5770 100644 (file)
@@ -854,7 +854,7 @@ esplusplayer_submit_status MediaPlayerESPlusPlayer::SubmitEsPacket(
   packet.type = GetESPlusPlayerStreamType(type);
 
   packet.buffer = (char*)(const_cast<unsigned char*>(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<esplusplayer_decoded_video_packet*>(packet));
 
index 59a3966129b9fef9440fdd91d6d045b5629c6560..0ad80fd278bc1e22cfc320c708aff37c21f2c08e 100644 (file)
@@ -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<PlatformSensorProvider> provider)
     : PlatformSensor(type, reading_buffer, provider),
       default_configuration_(PlatformSensorConfiguration()),
       weak_factory_(this) {
index a9fcd986a04aaf00d1138eccac418b6289388b8f..74f0900741907a3f2c7127cd54eddd25ec83fb23 100644 (file)
@@ -15,7 +15,7 @@ class PlatformSensorEfl : public PlatformSensor {
  public:
   PlatformSensorEfl(mojom::SensorType type,
                     SensorReadingSharedBuffer* reading_buffer,
-                    PlatformSensorProvider* provider);
+                    base::WeakPtr<PlatformSensorProvider> provider);
 
   PlatformSensorEfl(const PlatformSensorEfl&) = delete;
   PlatformSensorEfl& operator=(const PlatformSensorEfl&) = delete;
index 1b67c2652f54a99dd3f5526b9f897dc5600cf736..bbad44619aed05e393306633d00b3e8531d2f570 100644 (file)
@@ -4,37 +4,31 @@
 
 #include "services/device/generic_sensor/platform_sensor_provider_efl.h"
 
-#include <utility>
-#include <vector>
 
 #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<PlatformSensorProvider> 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<PlatformSensorEfl> 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<PlatformSensorEfl>(
+      type, GetSensorReadingSharedBufferForType(type), AsWeakPtr()));
 }
 
 }  // namespace device
index d382187dab06b8445f3c25c3c8a7743f58cf3c8d..8515ba07f97345e7854c663b1e799cf0a1b66ec8 100644 (file)
@@ -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 <typename T>
-struct DefaultSingletonTraits;
-}  // namespace base
-
 namespace device {
 
 class PlatformSensorEfl;
@@ -25,15 +21,14 @@ class PlatformSensorProviderEfl : public PlatformSensorProvider {
   PlatformSensorProviderEfl& operator=(const PlatformSensorProviderEfl&) =
       delete;
 
+  base::WeakPtr<PlatformSensorProvider> AsWeakPtr() override;
+
  protected:
   void CreateSensorInternal(mojom::SensorType type,
-                            SensorReadingSharedBuffer* reading_buffer,
                             CreateSensorCallback callback) override;
 
-  void FreeResources() override;
-
  private:
-  friend struct base::DefaultSingletonTraits<PlatformSensorProviderEfl>;
+  base::WeakPtrFactory<PlatformSensorProviderEfl> weak_factory_{this};
 };
 
 }  // namespace device
index ed21a61fa28fa7a35cc660890583a4459779a2c7..bf41c27bd36448334f8fb76a31f488a7c7998a6f 100644 (file)
@@ -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;
index 9e06f6fa75306c78b02e81b1a992bfa277fc1cdc..fb88506cde282088918e99aff0f8faed828c84b5 100644 (file)
@@ -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<autofill::AutofillPopupDelegate> delegate) {
+    base::WeakPtr<AutofillSuggestionDelegate> 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<CardUnmaskDelegate> delegate) {
-  NOTIMPLEMENTED();
-}
-
-void AutofillClientEfl::UpdateAutofillPopupDataListValues(
+void AutofillClientEfl::UpdateAutofillDataListValues(
     base::span<const SelectOption> 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<MigratableCreditCard>& 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<AutofillManager> AutofillClientEfl::CreateManager(
+    base::PassKey<ContentAutofillDriver> 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<MigratableCreditCard>& 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<CreditCard*>& candidates,
-    base::OnceCallback<void(const std::string&)> 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<Suggestion> AutofillClientEfl::GetPopupSuggestions() const {
-  NOTIMPLEMENTED();
-  return std::vector<Suggestion>();
-}
-
 void AutofillClientEfl::UpdatePopup(
     const std::vector<Suggestion>& 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<void(const std::string&)> callback) {
   NOTIMPLEMENTED();
 }
+#endif
 
 url::Origin AutofillClientEfl::GetLastCommittedPrimaryMainFrameOrigin() const {
   NOTREACHED();
index 24d9ccc0f275ec6184d8045a78ff1306c663f8cb..acc115dffe22fb83a828087a4f733cf574517779 100644 (file)
@@ -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<network::SharedURLLoaderFactory> 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<autofill::AutofillPopupDelegate> delegate) override;
-  void ShowUnmaskPrompt(
-      const CreditCard& card,
-      const CardUnmaskPromptOptions& card_unmask_prompt_options,
-      base::WeakPtr<CardUnmaskDelegate> delegate) override;
-  void UpdateAutofillPopupDataListValues(
+      base::WeakPtr<AutofillSuggestionDelegate> delegate) override;
+  void UpdateAutofillDataListValues(
       base::span<const SelectOption> 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<MigratableCreditCard>& 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<CreditCard*>& candidates,
-      base::OnceCallback<void(const std::string&)> callback) override;
-  void CreditCardUploadCompleted(bool card_saved) override;
-  void PinPopupView() override;
-  PopupOpenArgs GetReopenPopupArgs(
-      AutofillSuggestionTriggerSource trigger_source) const override;
-  std::vector<Suggestion> GetPopupSuggestions() const override;
+  void PinAutofillSuggestions() override;
   void UpdatePopup(const std::vector<Suggestion>& 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<TouchToFillDelegate> delegate,
       base::span<const autofill::CreditCard> 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<void(const std::string&)> callback) override;
+#endif
 
   void ShowSavePasswordPopup(
       std::unique_ptr<password_manager::PasswordFormManagerForUI> form_to_save);
@@ -165,8 +144,12 @@ class AutofillClientEfl : public ContentAutofillClient,
       const bool has_server_error,
       const std::u16string& tip_message,
       const std::vector<MigratableCreditCard>& migratable_credit_cards,
-      MigrationDeleteCardCallback delete_local_card_callback);
+      payments::PaymentsAutofillClient::MigrationDeleteCardCallback
+          delete_local_card_callback);
   AutocompleteHistoryManager* GetAutocompleteHistoryManager();
+  std::unique_ptr<AutofillManager> CreateManager(
+      base::PassKey<ContentAutofillDriver> pass_key,
+      ContentAutofillDriver& driver) override;
 
  private:
   explicit AutofillClientEfl(content::WebContents* web_contents);
index 97924876e29ef605c07ddf9aa45679622f01f94c..387b55a69a3d66c7aa9296e885b4c210735584f9 100644 (file)
@@ -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 {
 
index fcf60585bf09e719aee563feb82e96b9774de0bd..7bf9323be064fc654db02648e80f68711090bff0 100644 (file)
@@ -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 {
 
index 474a43170197b6733401e4979210bc55116897b8..3fac5c2b0b863b1d43e2b270147c3cdfa0f4074f 100644 (file)
@@ -51,6 +51,7 @@ PersonalDataManagerFactoryEfl::PersonalDataManagerForContext(
     return nullptr;
   }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m126 bringup
   std::unique_ptr<PersonalDataManager> 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;
 }
index 0fc3795c2f17bb912d86588a85c94d2914f90397..8e455efc8d36313e2c867447c2d79f7bc1c10e35 100644 (file)
@@ -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<autofill::Suggestion>& suggestions,
-          base::WeakPtr<AutofillPopupDelegate> delegate){
+    const std::vector<autofill::Suggestion>& suggestions,
+    base::WeakPtr<AutofillSuggestionDelegate> 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();
index d8d47cab7cc2813864bdb24adc5fbc2fce45557c..f9fb8ec6adf58b1b443bf13b6b7edfc133d5fc66 100644 (file)
@@ -15,7 +15,7 @@
 #include <Evas.h>
 
 #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<password_manager::PasswordFormManagerForUI> form_to_save);
   void UpdateFormDataPopup(const gfx::RectF& bounds);
   void UpdateLocation(const gfx::RectF& focused_element_bounds);
-  void InitFormData(
-      const std::vector<autofill::Suggestion>& suggestions,
-      base::WeakPtr<AutofillPopupDelegate> delegate);
+  void InitFormData(const std::vector<autofill::Suggestion>& suggestions,
+                    base::WeakPtr<AutofillSuggestionDelegate> 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<autofill::Suggestion> values_;
   size_t selected_line_;
-  base::WeakPtr<AutofillPopupDelegate> delegate_;
+  base::WeakPtr<AutofillSuggestionDelegate> delegate_;
   std::unique_ptr<password_manager::PasswordFormManagerForUI> form_manager_;
 };
 
index bd928f3b83f7a7d7be3177c1a3e2f3eec4fe5703..e23fce227b9cfb05b2c6c172f00c0f5c4c5ce043 100644 (file)
@@ -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<LocationProvider> NewSystemLocationProvider(
-    scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-    GeolocationManager* geolocation_manager) {
-  return base::WrapUnique(new LocationProviderEfl());
+std::unique_ptr<LocationProvider> NewSystemLocationProvider() {
+  return std::make_unique<LocationProviderEfl>();
 }
 
 }  // namespace device
index 2a6ed8d89fde7f104c905459bfd7ec585b909111..53667ebac21deea5f8411158f67b905f0bd33b89 100644 (file)
@@ -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<PasswordStore>& store,
 
 void RemoveLogins(const scoped_refptr<PasswordStore>& store) {
   if (store.get()) {
-    store->RemoveLoginsCreatedBetween(base::Time(), base::Time::Max(),
-                                      base::NullCallback());
+    store->RemoveLoginsCreatedBetween(FROM_HERE, base::Time(),
+                                      base::Time::Max());
   }
 }
 
index dbf1f0627afbcfd50927776e5a24680eaaeeb05e..e8fb0194423de5d5fcff8fabf82f5e559cc67605 100644 (file)
@@ -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<PasswordCrossDomainConfirmationPopupController>
+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;
 }
index ea92baf418dfc66de2afa384614473f9d9d3ba64..54656600c9b17047090c6522970b0e5494f34481 100644 (file)
@@ -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<std::unique_ptr<PasswordForm>> local_forms,
       const url::Origin& origin,
@@ -87,6 +81,7 @@ class PasswordManagerClientEfl
   void NotifySuccessfulLoginWithExistingPassword(
       std::unique_ptr<password_manager::PasswordFormManagerForUI>
           submitted_manager) override;
+  void NotifyKeychainError() override;
   void NotifyStorePasswordCalled() override;
   void AutomaticPasswordSave(
       std::unique_ptr<PasswordFormManagerForUI> 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<PasswordCrossDomainConfirmationPopupController>
+  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(
index 123e6c468101b8f13af741fd9d96ef0139420283..cbbe3ee94d1a878ae422a4ed398a5b4f1394acb5 100644 (file)
@@ -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<PasswordStore> ps = new password_manager::PasswordStore(
       std::make_unique<password_manager::PasswordStoreBuiltInBackend>(
-          std::move(login_db), syncer::WipeModelUponSyncDisabledBehavior()));
+          std::move(login_db), syncer::WipeModelUponSyncDisabledBehavior(),
+          nullptr));
 
   if (!ps.get()) {
     LOG(ERROR) << "Could not create password manager.";
index e64e4560f3db8fd4643795155b1992b2625a47dd..f4ebaa40ebd6ac901e8a6d3693d29cdf5f953072 100644 (file)
@@ -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_ =
index f246889f9fb8b45883dc70dad5c127d9ba48eb5f..0a517f68263bd8b418751421c32a8a182aee661d 100644 (file)
@@ -514,9 +514,9 @@ bool ContentBrowserClientEfl::BindAssociatedReceiverFromFrame(
 
   if (interface_name == autofill::mojom::AutofillDriver::Name_) {
     autofill::ContentAutofillDriverFactory::BindAutofillDriver(
+        render_frame_host,
         mojo::PendingAssociatedReceiver<autofill::mojom::AutofillDriver>(
-            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({}));
index 9dd2f300b894338c45f56f7e0889306979ea4116..333ac6f6f19372382f8586c7389996d54580b34d 100644 (file)
@@ -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<XWalkExtensionBrowserEfl>());
+#endif
 }
 #endif
 /* LCOV_EXCL_STOP */
index f0fbcdb039f0521a7fc71e81fa029a3167f252c8..4c0d4828e9d305550cf4a175151e46f8230008d3 100644 (file)
@@ -59,8 +59,9 @@ bool IsValidEwkGUID(const std::string& guid) {
 }
 }
 
-static std::map<DataType, autofill::ServerFieldType> create_EWK_to_Autofill_profile_map() {
-  std::map<DataType, autofill::ServerFieldType> profile_map;
+static std::map<DataType, autofill::FieldType>
+create_EWK_to_Autofill_profile_map() {
+  std::map<DataType, autofill::FieldType> 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<DataType, autofill::ServerFieldType> profile_map =
+  static std::map<DataType, autofill::FieldType> 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<autofill::ServerFieldType, DataType>
+static std::map<autofill::FieldType, DataType>
 create_Autofill_to_EWK_profile_map() {
-  std::map<autofill::ServerFieldType, DataType> profile_map;
-  std::map<DataType, autofill::ServerFieldType> autofill_map =
+  std::map<autofill::FieldType, DataType> profile_map;
+  std::map<DataType, autofill::FieldType> autofill_map =
       create_EWK_to_Autofill_profile_map();
-  for (std::map<DataType, autofill::ServerFieldType>::iterator it =
-      autofill_map.begin(); it!=autofill_map.end(); ++it)
+  for (std::map<DataType, autofill::FieldType>::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<autofill::ServerFieldType, DataType> profile_map =
+  static std::map<autofill::FieldType, DataType> 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<autofill::AutofillProfile*> 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;
 }
 
index 3d86750fe7f3c636a84cce722a1298fdb99ab87a..23834c5310cf929de8e8816e293b4ef857579b9b 100644 (file)
 #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<PasswordAutofillAgent> password_autofill_agent =
-        std::make_unique<PasswordAutofillAgent>(render_frame, registry);
+        std::make_unique<PasswordAutofillAgent>(
+            render_frame, registry, EnableHeavyFormDataScraping(false));
     std::unique_ptr<PasswordGenerationAgent> password_generation_agent =
         std::make_unique<PasswordGenerationAgent>(
             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<v8::Context> 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<v8::Context> 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
index e2f9bb308a32c6e396c5abb472ac2c36bad131d1..8891800a89deac9e8305751ca8e1e0e15599a941 100644 (file)
@@ -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;
 }
index 51edfbfe6c7eed327346a88ac754f2519af4fd05..f6c706d823ddc5ab14d23c0fc342981c43a2e312 100644 (file)
@@ -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,
index f0c05b32c23cf4f55e174463266cd5449ca0c29c..294bf062fd1423e57365876d53b347803d97615b 100644 (file)
@@ -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;
 };
index 2c972389c8bb604bdb5173a222f4c5a0d8dabd32..8db427ee7cba559a99233bd319cf99327081b999 100644 (file)
@@ -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",