bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash during process shutdown (issue #2096)

This commit is contained in:
Marshall Greenblatt 2017-02-14 10:09:42 -08:00
parent feaca0ddf2
commit 54424d0edc
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patch/patch.cfg
View File

@ -248,6 +248,10 @@ patches = [
# Clear RenderProcessHostImpl's |browser_context_| member when the
# BrowserContext is deleted.
# https://bitbucket.org/chromiumembedded/cef/issues/2032
#
# Check RenderProcessHostImpl's |browser_context_| member before re-
# initializing the channel from RPHI::ProcessDied.
# https://bitbucket.org/chromiumembedded/cef/issues/2096
'name': 'storage_partition_1973',
'path': '../',
},

11
patch/patches/storage_partition_1973.patch
View File

@ -91,7 +91,7 @@ index 242d33e..4dfb463 100644
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index 5e75c17..28fdb04 100644
index 5e75c17..25d62a8 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -653,7 +653,7 @@ void RenderProcessHostImpl::EarlyZygoteLaunch() {
@ -113,6 +113,15 @@ index 5e75c17..28fdb04 100644
ChromeBlobStorageContext::GetFor(browser_context_))),
channel_connected_(false),
sent_render_process_ready_(false),
@@ -914,7 +915,7 @@ bool RenderProcessHostImpl::Init() {
}
void RenderProcessHostImpl::EnableSendQueue() {
- if (!channel_)
+ if (!channel_ && browser_context_)
InitializeChannelProxy();
}
@@ -1010,6 +1011,22 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() {