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

Merge revision 1369 changes: 

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

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1547@1370 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-08-16 17:05:59 +00:00
parent ae888cc8a2
commit 81230ba459
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcef/renderer/browser_impl.cc
View File

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