[M67 Migration] Prevent double free of MailboxManager unique pointer

Crash is observed at browser shutdown as MaiboxManager is getting
deleted twice, once when GpuChannelManager is destroyed and again
in SharedMailboxManager. Since we already maintain a unique pointer
(static) for MailboxManager in SharedMailboxManager, GpuChannelManager
doesn't necessarily need to have another.

This patch also avoids creation of GLShareGroup and MailboxManager
in GpuChannelManager as they are anyway overriden in GpuChildThreadEfl.

Reference :
https://review.tizen.org/gerrit/#/c/179612

Change-Id: I3d4e7e211bb1260ccf28a03da92a94b39f6a16d0
Signed-off-by: Uzair <uzair.jaleel@samsung.com>

diff --git a/gpu/ipc/service/gpu_channel_manager.cc b/gpu/ipc/service/gpu_channel_manager.cc
index d055d94..01ded8c 100644 (file)
--- a/gpu/ipc/service/gpu_channel_manager.cc
+++ b/gpu/ipc/service/gpu_channel_manager.cc
@@ -64,8 +64,10 @@ GpuChannelManager::GpuChannelManager(
           gpu_feature_info.enabled_gpu_driver_bug_workarounds),
       delegate_(delegate),
       watchdog_(watchdog),
+#if !defined(USE_EFL)
       share_group_(new gl::GLShareGroup()),
       mailbox_manager_(gles2::CreateMailboxManager(gpu_preferences)),
+#endif
       gpu_memory_manager_(this),
       scheduler_(scheduler),
       sync_point_manager_(sync_point_manager),

diff --git a/gpu/ipc/service/gpu_channel_manager.h b/gpu/ipc/service/gpu_channel_manager.h
index 598f39e..8dd2779 100644 (file)
--- a/gpu/ipc/service/gpu_channel_manager.h
+++ b/gpu/ipc/service/gpu_channel_manager.h
@@ -127,7 +127,11 @@ class GPU_IPC_SERVICE_EXPORT GpuChannelManager {
 
   bool is_exiting_for_lost_context() { return exiting_for_lost_context_; }
 
+#if defined(USE_EFL)
+  MailboxManager* mailbox_manager() { return mailbox_manager_; }
+#else
   MailboxManager* mailbox_manager() { return mailbox_manager_.get(); }
+#endif
 
   gl::GLShareGroup* share_group() const { return share_group_.get(); }
 
@@ -161,8 +165,11 @@ class GPU_IPC_SERVICE_EXPORT GpuChannelManager {
   GpuWatchdogThread* watchdog_;
 
   scoped_refptr<gl::GLShareGroup> share_group_;
-
+#if defined(USE_EFL)
+  MailboxManager* mailbox_manager_;
+#else
   std::unique_ptr<MailboxManager> mailbox_manager_;
+#endif
   std::unique_ptr<gles2::Outputter> outputter_;
   GpuMemoryManager gpu_memory_manager_;
   Scheduler* scheduler_;

diff --git a/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc b/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc
index 230a80d..665b769 100644 (file)
--- a/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc
+++ b/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc
@@ -34,7 +34,7 @@ struct GpuChildThreadEfl : public content::GpuChildThread {
     gpu_service->gpu_channel_manager()->share_group_ =
         GLSharedContextEfl::GetShareGroup();
     gpu_service->gpu_channel_manager()->mailbox_manager_ =
-        base::WrapUnique(SharedMailboxManager::GetMailboxManager());
+        SharedMailboxManager::GetMailboxManager();
   }
 };