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:
@@ -25,7 +25,6 @@
|
||||
#include "ctocpp/domevent_listener_ctocpp.h"
|
||||
#include "ctocpp/domvisitor_ctocpp.h"
|
||||
#include "ctocpp/download_handler_ctocpp.h"
|
||||
#include "ctocpp/handler_ctocpp.h"
|
||||
#include "ctocpp/read_handler_ctocpp.h"
|
||||
#include "ctocpp/scheme_handler_ctocpp.h"
|
||||
#include "ctocpp/scheme_handler_factory_ctocpp.h"
|
||||
@@ -37,19 +36,15 @@
|
||||
#include "base/string_split.h"
|
||||
|
||||
|
||||
CEF_EXPORT int cef_initialize(const struct _cef_settings_t* settings,
|
||||
const struct _cef_browser_settings_t* browser_defaults)
|
||||
CEF_EXPORT int cef_initialize(const struct _cef_settings_t* settings)
|
||||
{
|
||||
CefSettings settingsObj;
|
||||
CefBrowserSettings browserDefaultsObj;
|
||||
|
||||
// Reference the values instead of copying.
|
||||
if (settings)
|
||||
settingsObj.Set(*settings, false);
|
||||
if (browser_defaults)
|
||||
browserDefaultsObj.Set(*browser_defaults, false);
|
||||
|
||||
int ret = CefInitialize(settingsObj, browserDefaultsObj);
|
||||
int ret = CefInitialize(settingsObj);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -58,7 +53,7 @@ CEF_EXPORT void cef_shutdown()
|
||||
{
|
||||
CefShutdown();
|
||||
|
||||
#ifdef _DEBUG
|
||||
#ifndef NDEBUG
|
||||
// Check that all wrapper objects have been destroyed
|
||||
DCHECK(CefBrowserCppToC::DebugObjCt == 0);
|
||||
DCHECK(CefDOMDocumentCppToC::DebugObjCt == 0);
|
||||
@@ -85,12 +80,7 @@ CEF_EXPORT void cef_shutdown()
|
||||
DCHECK(CefV8HandlerCToCpp::DebugObjCt == 0);
|
||||
DCHECK(CefWebURLRequestClientCToCpp::DebugObjCt == 0);
|
||||
DCHECK(CefWriteHandlerCToCpp::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(CefHandlerCToCpp::DebugObjCt == 0);
|
||||
#endif // _DEBUG
|
||||
#endif // !NDEBUG
|
||||
}
|
||||
|
||||
CEF_EXPORT void cef_do_message_loop_work()
|
||||
|
||||
Reference in New Issue
Block a user