bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-23 15:37:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1369 changes:

Browse Source 
- Fix render process crash when detaching a frame that never navigated.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1371 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-08-16 17:06:45 +00:00
parent 185e56cc2c
commit 7263d45bbf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cef3/libcef/renderer/browser_impl.cc
View File

@ -470,13 +470,14 @@ void CefBrowserImpl::DidStartProvisionalLoad(WebKit::WebFrame* frame) {
void CefBrowserImpl::FrameDetached(WebFrame* frame) {
int64 frame_id = frame->identifier();
{
if (!frames_.empty()) {
// Remove the frame from the map.
FrameMap::iterator it = frames_.find(frame_id);
DCHECK(it != frames_.end());
if (it != frames_.end()) {
it->second->Detach();
frames_.erase(it);
}
}
if (!frame_objects_.empty()) {
// Remove any tracked objects associated with the frame.