mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Significant API changes for issue #218:
- Replace CefHandler with a new CefClient interface and separate handler interfaces. - Add support for virtual inheritance to allow multiple CefBase parented interfaces to be implemented in the same class. - Replace CefThreadSafeBase with IMPLEMENT_* macros to support virtual inheritance and to only provide locking implementations when needed. - Move the CefBrowserSettings parameter from CefInitialize to CreateBrowser. - Add a new cef_build.h header that provides platform-specific and OS_* defines. - Introduce the use of OVERRIDE to generate compiler errors on Windows if a child virtual method declaration doesn't match the parent declaration. - Use NDEBUG instead of _DEBUG because _DEBUG is not defined on Mac. (issue #240). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@235 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -10,7 +10,6 @@
|
||||
#include "libcef_dll/cpptoc/domevent_listener_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/domvisitor_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/download_handler_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/handler_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/read_handler_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/scheme_handler_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h"
|
||||
@@ -35,17 +34,16 @@
|
||||
#include "libcef_dll/ctocpp/zip_reader_ctocpp.h"
|
||||
|
||||
|
||||
bool CefInitialize(const CefSettings& settings,
|
||||
const CefBrowserSettings& browser_defaults)
|
||||
bool CefInitialize(const CefSettings& settings)
|
||||
{
|
||||
return cef_initialize(&settings, &browser_defaults)?true:false;
|
||||
return cef_initialize(&settings)?true:false;
|
||||
}
|
||||
|
||||
void CefShutdown()
|
||||
{
|
||||
cef_shutdown();
|
||||
|
||||
#ifdef _DEBUG
|
||||
#ifndef NDEBUG
|
||||
// Check that all wrapper objects have been destroyed
|
||||
DCHECK(CefCookieVisitorCppToC::DebugObjCt == 0);
|
||||
DCHECK(CefDOMEventListenerCppToC::DebugObjCt == 0);
|
||||
@@ -72,12 +70,7 @@ void CefShutdown()
|
||||
DCHECK(CefWebURLRequestCToCpp::DebugObjCt == 0);
|
||||
DCHECK(CefXmlReaderCToCpp::DebugObjCt == 0);
|
||||
DCHECK(CefZipReaderCToCpp::DebugObjCt == 0);
|
||||
|
||||
// TODO: This breakpoint may be hit if content is still loading when CEF
|
||||
// exits. Re-enable the breakpoint if/when CEF stops content loading before
|
||||
// exit.
|
||||
//DCHECK(CefHandlerCppToC::DebugObjCt == 0);
|
||||
#endif // _DEBUG
|
||||
#endif // !NDEBUG
|
||||
}
|
||||
|
||||
void CefDoMessageLoopWork()
|
||||
|
Reference in New Issue
Block a user