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

Fix crash when pending navigation executes after the browser window has been destroyed (issue #724).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@791 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-09-20 19:48:39 +00:00
parent f6fcf8e1f6
commit 11012b9c8c
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cef1/libcef/browser_impl.cc
View File

@ -334,6 +334,9 @@ void CefBrowserImpl::SetZoomLevel(double zoomLevel) {
void CefBrowserImpl::ClearHistory() {
if (CefThread::CurrentlyOn(CefThread::UI)) {
if (!nav_controller_.get())
return;
bool old_can_go_back = !nav_controller_->IsAtStart();
bool old_can_go_forward = !nav_controller_->IsAtEnd();
nav_controller_->Reset();
@ -849,11 +852,12 @@ void CefBrowserImpl::UIT_LoadURLForRequestRef(CefRefPtr<CefFrame> frame,
UIT_LoadURLForRequest(frame, url, method, upload_data, headers);
}
void CefBrowserImpl::UIT_LoadURLForRequest(CefRefPtr<CefFrame> frame,
const CefString& url,
const CefString& method,
const WebKit::WebHTTPBody& upload_data,
const CefRequest::HeaderMap& headers) {
void CefBrowserImpl::UIT_LoadURLForRequest(
CefRefPtr<CefFrame> frame,
const CefString& url,
const CefString& method,
const WebKit::WebHTTPBody& upload_data,
const CefRequest::HeaderMap& headers) {
REQUIRE_UIT();
if (url.empty())
@ -870,9 +874,11 @@ void CefBrowserImpl::UIT_LoadURLForRequest(CefRefPtr<CefFrame> frame,
return;
}
nav_controller_->LoadEntry(
new BrowserNavigationEntry(-1, gurl, CefString(), frame->GetName(),
method, upload_data, headers));
if (nav_controller_.get()) {
nav_controller_->LoadEntry(
new BrowserNavigationEntry(-1, gurl, CefString(), frame->GetName(),
method, upload_data, headers));
}
}
void CefBrowserImpl::UIT_LoadHTML(CefRefPtr<CefFrame> frame,
@ -945,12 +951,14 @@ void CefBrowserImpl::UIT_ExecuteJavaScript(CefRefPtr<CefFrame> frame,
void CefBrowserImpl::UIT_GoBackOrForward(int offset) {
REQUIRE_UIT();
nav_controller_->GoToOffset(offset);
if (nav_controller_.get())
nav_controller_->GoToOffset(offset);
}
void CefBrowserImpl::UIT_Reload(bool ignoreCache) {
REQUIRE_UIT();
nav_controller_->Reload(ignoreCache);
if (nav_controller_.get())
nav_controller_->Reload(ignoreCache);
}
bool CefBrowserImpl::UIT_Navigate(const BrowserNavigationEntry& entry,