From 94fc3041dec32400e49d82cd19c080adee492e3f Mon Sep 17 00:00:00 2001 From: Antonio Gomes Date: Fri, 29 May 2015 13:00:08 -0400 Subject: [PATCH] fixup! ozone integration Since http://165.213.202.130/gerrit/#/c/80317/ we hit the follow ASSERT upon launch (desktop debug build of ubrowser --mobile). [0529/105606:FATAL:at_exit.cc(53)] Check failed: false. Tried to RegisterCallback without an AtExitManager #0 0x7fee4c9d7037 base::debug::StackTrace::StackTrace() #1 0x7fee4ca15373 logging::LogMessage::~LogMessage() #2 0x7fee4c9c9ff1 base::AtExitManager::RegisterTask() #3 0x7fee4dcf0f56 ui::DeviceDataManager::DeviceDataManager() #4 0x7fee4dcf1197 ui::DeviceDataManager::CreateInstance() #5 0x7fee4dd09ca5 ui::OzonePlatform::InitializeForUI() #6 0x7fee4ba14c64 EwkGlobalData::GetInstance() #7 0x7fee4b9d4d83 EWebContext::EWebContext() #8 0x7fee4bab0d29 Ewk_Context::Ewk_Context() #9 0x7fee4bab0b6b Ewk_Context::Create() #10 0x7fee4bab09b2 Ewk_Context::DefaultContext() #11 0x7fee4baba2f5 ewk_context_default_get #12 0x000000407c00 Browser::Browser() #13 0x00000040c167 app_create() #14 0x00000040c43e main #15 0x7fee49591ec5 __libc_start_main AtExitManager has to be init'ed before frame #5, or AtExitManager could be declared as a local variable in 'main'. In our code, the initialization happens in the lines right below the call to OzonePlatform::InitializeForUI. See content/app/content_main_runner.cc@Initialize. Patch flips those lines in order to fix the ASSERT. Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=8054 Reviewed by: Balazs Kelemen, arno renevier Change-Id: Ib4705a858f10561d86f5779e99a661fe37edf4c8 Signed-off-by: Antonio Gomes --- tizen_src/ewk/efl_integration/ewk_global_data.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc index 9624531..42237e1 100644 --- a/tizen_src/ewk/efl_integration/ewk_global_data.cc +++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc @@ -107,13 +107,13 @@ EwkGlobalData* EwkGlobalData::GetInstance() { content::MainFunctionParams main_funtion_params = CommandLineEfl::GetDefaultPortParams(); + instance_->content_main_runner_->Initialize(params); + instance_->browser_main_runner_->Initialize(main_funtion_params); + #if defined(USE_OZONE) ui::OzonePlatform::InitializeForUI(); #endif - instance_->content_main_runner_->Initialize(params); - instance_->browser_main_runner_->Initialize(main_funtion_params); - base::ThreadRestrictions::SetIOAllowed(true); base::FilePath pak_dir; -- 2.7.4