bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove NOTREACHED assertion in CefRegisterSchemeHandlerFactory because it may be hit during registration of internal schemes if CEF is shut down quickly (issue #571).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@970 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-01-03 12:55:42 +00:00
parent 22ed9d9140
commit dc5c4c50ac
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/browser/scheme_impl.cc
View File

@@ -283,10 +283,8 @@ bool CefRegisterSchemeHandlerFactory(
const CefString& domain_name, const CefString& domain_name,
CefRefPtr<CefSchemeHandlerFactory> factory) { CefRefPtr<CefSchemeHandlerFactory> factory) {
// Verify that the context is in a valid state. // Verify that the context is in a valid state.
if (!CONTEXT_STATE_VALID()) { if (!CONTEXT_STATE_VALID())
NOTREACHED() << "context not valid";
return false; return false;
}
if (CEF_CURRENTLY_ON(CEF_IOT)) { if (CEF_CURRENTLY_ON(CEF_IOT)) {
return CefUrlRequestManager::GetInstance()->AddFactory(scheme_name, return CefUrlRequestManager::GetInstance()->AddFactory(scheme_name,
@@ -302,10 +300,8 @@ bool CefRegisterSchemeHandlerFactory(
bool CefClearSchemeHandlerFactories() { bool CefClearSchemeHandlerFactories() {
// Verify that the context is in a valid state. // Verify that the context is in a valid state.
if (!CONTEXT_STATE_VALID()) { if (!CONTEXT_STATE_VALID())
NOTREACHED() << "context not valid";
return false; return false;
}
if (CEF_CURRENTLY_ON(CEF_IOT)) { if (CEF_CURRENTLY_ON(CEF_IOT)) {
CefUrlRequestManager::GetInstance()->ClearFactories(); CefUrlRequestManager::GetInstance()->ClearFactories();