From b62b8aad48088e59283d2d91dd7af95a89657727 Mon Sep 17 00:00:00 2001 From: Chandan Padhi Date: Mon, 13 Aug 2018 16:43:46 +0530 Subject: [PATCH] [M67 Dev][Tizen] Fix crashes at webview launch This commit fixes the crashes during webview launch. Change-Id: Ieeae889de17c3ca48814dacf1d320a9380719ef3 Signed-off-by: Chandan Padhi --- content/zygote/zygote_main_linux.cc | 5 +++++ .../content/browser/renderer_host/render_widget_host_view_efl.cc | 2 ++ tizen_src/chromium_impl/content/common/paths_efl.cc | 1 + tools/v8_context_snapshot/v8_context_snapshot.gni | 4 ++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 12447a0..8bf29f2 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -160,8 +160,13 @@ static void EnterLayerOneSandbox(service_manager::SandboxLinux* linux_sandbox, // It's not just our code which may do so - some system-installed libraries // are known to be culprits, e.g. lttng. #if !defined(THREAD_SANITIZER) +#if defined(OS_TIZEN) + // TODO: Check why IsSingleThreaded() returns false for tizen port. + DCHECK(sandbox::ThreadHelpers::IsSingleThreaded()); +#else CHECK(sandbox::ThreadHelpers::IsSingleThreaded()); #endif +#endif sandbox::SetuidSandboxClient* setuid_sandbox = linux_sandbox->setuid_sandbox_client(); diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc index c79d0e7..ab25eff 100644 --- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc +++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc @@ -637,6 +637,7 @@ void RenderWidgetHostViewEfl::OnDidHandleKeyEvent( } void RenderWidgetHostViewEfl::UpdateCursor(const WebCursor& webcursor) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup if (is_loading_) { // Setting native Loading cursor #if defined(USE_WAYLAND) @@ -658,6 +659,7 @@ void RenderWidgetHostViewEfl::UpdateCursor(const WebCursor& webcursor) { ecore_x_cursor_shape_get(cursor_type)); #endif } +#endif // EWK_BRINGUP } void RenderWidgetHostViewEfl::SetIsLoading(bool is_loading) { diff --git a/tizen_src/chromium_impl/content/common/paths_efl.cc b/tizen_src/chromium_impl/content/common/paths_efl.cc index 6fe0acd..952c115 100644 --- a/tizen_src/chromium_impl/content/common/paths_efl.cc +++ b/tizen_src/chromium_impl/content/common/paths_efl.cc @@ -147,6 +147,7 @@ bool PathProvider(int key, base::FilePath* result) { switch (key) { #ifdef OS_TIZEN case base::DIR_EXE: + case base::DIR_MODULE: *result = base::FilePath(kExePath); return true; #endif diff --git a/tools/v8_context_snapshot/v8_context_snapshot.gni b/tools/v8_context_snapshot/v8_context_snapshot.gni index 6a6f477..828c366 100644 --- a/tools/v8_context_snapshot/v8_context_snapshot.gni +++ b/tools/v8_context_snapshot/v8_context_snapshot.gni @@ -15,8 +15,8 @@ declare_args() { # TODO(crbug.com/764576): Enable the feature on more environments. # Disable in win/cross builds since buliding Blink twice is slow. use_v8_context_snapshot = - !is_chromeos && !is_android && !is_chromecast && !is_fuchsia && - !(host_os == "mac" && current_cpu == "x86") && + !is_chromeos && !is_android && !is_tizen && !is_chromecast && + !is_fuchsia && !(host_os == "mac" && current_cpu == "x86") && (v8_target_cpu == target_cpu || is_msan) && !(is_win && host_os != "win") } -- 2.7.4