Fix memory leaks in browser process

This patch allows to destroy a XWalkExtensionData object
in XWalkExtensionService when a render process is killed.

BUG=TC-2407

Change-Id: Iabdbaa0401b3fd1e1666999b6f240a601e3c25d3

diff --git a/src/xwalk/application/browser/application.cc b/src/xwalk/application/browser/application.cc
index 0ed2bfa..a5555ba 100644 (file)
--- a/src/xwalk/application/browser/application.cc
+++ b/src/xwalk/application/browser/application.cc
@@ -302,6 +302,9 @@ void Application::RenderProcessHostDestroyed(RenderProcessHost* host) {
   DCHECK(render_process_host_ == host);
   if (render_process_host_)
     render_process_host_->RemoveObserver(this);
+  // FIXME: Application::RenderProcessExited is not called so run
+  // OnRenderProcessHostGone here.
+  XWalkRunner::GetInstance()->OnRenderProcessHostGone(host);
   render_process_host_ = NULL;
   web_contents_ = NULL;
 }

diff --git a/src/xwalk/extensions/browser/xwalk_extension_process_host.cc b/src/xwalk/extensions/browser/xwalk_extension_process_host.cc
index 51ad9ed..4430fea 100644 (file)
--- a/src/xwalk/extensions/browser/xwalk_extension_process_host.cc
+++ b/src/xwalk/extensions/browser/xwalk_extension_process_host.cc
@@ -222,6 +222,9 @@ void XWalkExtensionProcessHost::StopProcess() {
     process_.reset();
   if (channel_)
     channel_.reset();
+
+  if (delegate_)
+    delegate_->OnExtensionProcessDied(this, render_process_host_->GetID());
 }
 
 void XWalkExtensionProcessHost::OnGetExtensionProcessChannel(