From bac9af8776d7d6b6fccb914f68c4b0f7b23cd11b Mon Sep 17 00:00:00 2001 From: Chandan Padhi Date: Tue, 12 Oct 2021 19:02:23 +0530 Subject: [PATCH] [M94 Dev][EFL] Fix crashes at webview launch This commit fixes the crashes at webview launch. Change-Id: Id76e889485509ae84555f2903a7f0e01d99529c7 Signed-off-by: Chandan Padhi --- tizen_src/build/gn_chromiumefl.sh | 2 ++ .../content/browser/compositor/evasgl_delegated_frame_host.cc | 2 +- tizen_src/chromium_impl/ui/ui_efl.gni | 1 - tizen_src/ewk/efl_integration/ewk_global_data.cc | 4 ++++ ui/base/clipboard/BUILD.gn | 2 +- ui/base/clipboard/clipboard.cc | 5 +---- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tizen_src/build/gn_chromiumefl.sh b/tizen_src/build/gn_chromiumefl.sh index d93f966..cd1cce8 100755 --- a/tizen_src/build/gn_chromiumefl.sh +++ b/tizen_src/build/gn_chromiumefl.sh @@ -119,6 +119,7 @@ COMMON_GN_PARAMETERS="use_libjpeg_turbo=true use_allocator=\"none\" depth=\"${TOPDIR}\" use_libpci=false + use_x11=false " add_desktop_flags() { @@ -137,6 +138,7 @@ add_desktop_flags() { use_sysroot=false use_wayland=false werror=false + dcheck_always_on=false " } diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc index 6f928f0..4237aee 100644 --- a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc +++ b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc @@ -37,6 +37,7 @@ void EvasGLDelegatedFrameHost::Initialize() { auto resource_provider = std::make_unique( output_surface_->context_provider(), false /* enable_shared_images */); + resource_provider_ = std::move(resource_provider); child_id_ = resource_provider_->CreateChild( base::BindRepeating(&EvasGLDelegatedFrameHost::UnrefResources, @@ -46,7 +47,6 @@ void EvasGLDelegatedFrameHost::Initialize() { renderer_ = std::make_unique( &settings_, &debug_settings_, output_surface_.get(), resource_provider.get(), nullptr, nullptr); - resource_provider_ = std::move(resource_provider); renderer_->Initialize(); renderer_->SetVisible(true); is_initialized_ = true; diff --git a/tizen_src/chromium_impl/ui/ui_efl.gni b/tizen_src/chromium_impl/ui/ui_efl.gni index 6b7ed01..5569643 100644 --- a/tizen_src/chromium_impl/ui/ui_efl.gni +++ b/tizen_src/chromium_impl/ui/ui_efl.gni @@ -104,7 +104,6 @@ external_ui_base_sources = [ "//tizen_src/chromium_impl/ui/base/resource/resource_bundle_efl.cc", "//ui/base/nine_image_painter_factory.h", "clipboard/clipboard_format_type_aura.cc", - "clipboard/clipboard_ozone.cc", ] # FIXME: ewk_bringup definition should be removed. diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc index 2ff0046..3c7b9b6 100644 --- a/tizen_src/ewk/efl_integration/ewk_global_data.cc +++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc @@ -10,6 +10,7 @@ #include "base/path_service.h" #include "browser/autofill/personal_data_manager_factory.h" #include "components/discardable_memory/service/discardable_shared_memory_manager.h" +#include "components/variations/variations_ids_provider.h" #include "content/app/mojo_ipc_support.h" #include "content/browser/gpu/gpu_main_thread_factory.h" #include "content/browser/gpu/gpu_process_host.h" @@ -143,6 +144,9 @@ EwkGlobalData* EwkGlobalData::GetInstance() { content::StartBrowserThreadPool(); content::BrowserTaskExecutor::Create(); + variations::VariationsIdsProvider::Create( + variations::VariationsIdsProvider::Mode::kUseSignedInState); + instance_->discardable_shared_memory_manager_ = std::make_unique(); diff --git a/ui/base/clipboard/BUILD.gn b/ui/base/clipboard/BUILD.gn index 1e1758f..3ad6d36 100644 --- a/ui/base/clipboard/BUILD.gn +++ b/ui/base/clipboard/BUILD.gn @@ -129,7 +129,7 @@ component("clipboard") { "//ui/base/data_transfer_policy", ] - if (use_aura) { + if (use_aura || use_efl) { if (use_ozone) { sources += [ "clipboard_data.cc", diff --git a/ui/base/clipboard/clipboard.cc b/ui/base/clipboard/clipboard.cc index 1824331..1916e5c 100644 --- a/ui/base/clipboard/clipboard.cc +++ b/ui/base/clipboard/clipboard.cc @@ -86,13 +86,10 @@ Clipboard* Clipboard::GetForCurrentThread() { auto it = clipboard_map->find(id); if (it != clipboard_map->end()) return it->second.get(); - LOG(ERROR) << " CLIPBOARDEFL BINGUP NEEEDS TO BE DONE"; - return nullptr; -#if !defined(EWK_BRINGUP) // FIXME:m85 bringup + Clipboard* clipboard = Clipboard::Create(); clipboard_map->insert({id, base::WrapUnique(clipboard)}); return clipboard; -#endif } // static -- 2.7.4