From ce09018499083b3d30cf50ff45db533f9b38c15a Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 11 Jul 2013 16:56:12 +0000 Subject: [PATCH] Merge revision 1299 changes: - Remove the debug count check for CefCookieManager. git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1300 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef3/include/cef_cookie.h | 2 +- cef3/libcef_dll/libcef_dll.cc | 2 -- cef3/libcef_dll/wrapper/libcef_dll_wrapper.cc | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cef3/include/cef_cookie.h b/cef3/include/cef_cookie.h index 8a7267d56..807279b72 100644 --- a/cef3/include/cef_cookie.h +++ b/cef3/include/cef_cookie.h @@ -49,7 +49,7 @@ class CefCookieVisitor; // Class used for managing cookies. The methods of this class may be called on // any thread unless otherwise indicated. /// -/*--cef(source=library)--*/ +/*--cef(source=library,no_debugct_check)--*/ class CefCookieManager : public virtual CefBase { public: /// diff --git a/cef3/libcef_dll/libcef_dll.cc b/cef3/libcef_dll/libcef_dll.cc index 0bfb131e7..769009a2b 100644 --- a/cef3/libcef_dll/libcef_dll.cc +++ b/cef3/libcef_dll/libcef_dll.cc @@ -41,7 +41,6 @@ #include "libcef_dll/cpptoc/callback_cpptoc.h" #include "libcef_dll/cpptoc/command_line_cpptoc.h" #include "libcef_dll/cpptoc/context_menu_params_cpptoc.h" -#include "libcef_dll/cpptoc/cookie_manager_cpptoc.h" #include "libcef_dll/cpptoc/domdocument_cpptoc.h" #include "libcef_dll/cpptoc/domevent_cpptoc.h" #include "libcef_dll/cpptoc/domnode_cpptoc.h" @@ -185,7 +184,6 @@ CEF_EXPORT void cef_shutdown() { DCHECK_EQ(CefCompletionHandlerCToCpp::DebugObjCt, 0); DCHECK_EQ(CefContextMenuHandlerCToCpp::DebugObjCt, 0); DCHECK_EQ(CefContextMenuParamsCppToC::DebugObjCt, 0); - DCHECK_EQ(CefCookieManagerCppToC::DebugObjCt, 0); DCHECK_EQ(CefCookieVisitorCToCpp::DebugObjCt, 0); DCHECK_EQ(CefDOMDocumentCppToC::DebugObjCt, 0); DCHECK_EQ(CefDOMEventCppToC::DebugObjCt, 0); diff --git a/cef3/libcef_dll/wrapper/libcef_dll_wrapper.cc b/cef3/libcef_dll/wrapper/libcef_dll_wrapper.cc index bdd0464dd..1ff8db778 100644 --- a/cef3/libcef_dll/wrapper/libcef_dll_wrapper.cc +++ b/cef3/libcef_dll/wrapper/libcef_dll_wrapper.cc @@ -77,7 +77,6 @@ #include "libcef_dll/ctocpp/callback_ctocpp.h" #include "libcef_dll/ctocpp/command_line_ctocpp.h" #include "libcef_dll/ctocpp/context_menu_params_ctocpp.h" -#include "libcef_dll/ctocpp/cookie_manager_ctocpp.h" #include "libcef_dll/ctocpp/domdocument_ctocpp.h" #include "libcef_dll/ctocpp/domevent_ctocpp.h" #include "libcef_dll/ctocpp/domnode_ctocpp.h" @@ -177,7 +176,6 @@ CEF_GLOBAL void CefShutdown() { DCHECK_EQ(CefCompletionHandlerCppToC::DebugObjCt, 0); DCHECK_EQ(CefContextMenuHandlerCppToC::DebugObjCt, 0); DCHECK_EQ(CefContextMenuParamsCToCpp::DebugObjCt, 0); - DCHECK_EQ(CefCookieManagerCToCpp::DebugObjCt, 0); DCHECK_EQ(CefCookieVisitorCppToC::DebugObjCt, 0); DCHECK_EQ(CefDOMDocumentCToCpp::DebugObjCt, 0); DCHECK_EQ(CefDOMEventCToCpp::DebugObjCt, 0);