Use DCHECK_IS_ON() instead of !NDEBUG for debug logic (issue #1961)

This commit is contained in:
Marshall Greenblatt 2016-09-01 14:24:30 +03:00
parent 71d9d35fc3
commit d811450a32
278 changed files with 320 additions and 525 deletions

View File

@ -45,6 +45,7 @@
// If the Chromium implementation diverges the below implementation should be
// updated to match.
#include "include/base/cef_logging.h"
#include "include/base/cef_macros.h"
#include "include/base/cef_platform_thread.h"
#include "include/base/internal/cef_lock_impl.h"
@ -57,7 +58,7 @@ namespace cef_internal {
// AssertAcquired() method.
class Lock {
public:
#if defined(NDEBUG) // Optimized wrapper implementation
#if !DCHECK_IS_ON() // Optimized wrapper implementation
Lock() : lock_() {}
~Lock() {}
void Acquire() { lock_.Lock(); }
@ -96,10 +97,10 @@ class Lock {
}
void AssertAcquired() const;
#endif // NDEBUG
#endif // !DCHECK_IS_ON()
private:
#if !defined(NDEBUG)
#if DCHECK_IS_ON()
// Members and routines taking care of locks assertions.
// Note that this checks for recursive locks and allows them
// if the variable is set. This is allowed by the underlying implementation
@ -111,7 +112,7 @@ class Lock {
// All private data is implicitly protected by lock_.
// Be VERY careful to only access members under that lock.
base::PlatformThreadRef owning_thread_ref_;
#endif // NDEBUG
#endif // DCHECK_IS_ON()
// Platform specific underlying lock implementation.
LockImpl lock_;

View File

@ -50,9 +50,7 @@
#include "include/base/cef_atomic_ref_count.h"
#include "include/base/cef_build.h"
#ifndef NDEBUG
#include "include/base/cef_logging.h"
#endif
#include "include/base/cef_thread_collision_warner.h"
namespace base {
@ -66,14 +64,14 @@ class RefCountedBase {
protected:
RefCountedBase()
: ref_count_(0)
#ifndef NDEBUG
#if DCHECK_IS_ON()
, in_dtor_(false)
#endif
{
}
~RefCountedBase() {
#ifndef NDEBUG
#if DCHECK_IS_ON()
DCHECK(in_dtor_) << "RefCounted object deleted without calling Release()";
#endif
}
@ -84,7 +82,7 @@ class RefCountedBase {
// Current thread books the critical section "AddRelease"
// without release it.
// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
#ifndef NDEBUG
#if DCHECK_IS_ON()
DCHECK(!in_dtor_);
#endif
++ref_count_;
@ -96,11 +94,11 @@ class RefCountedBase {
// Current thread books the critical section "AddRelease"
// without release it.
// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
#ifndef NDEBUG
#if DCHECK_IS_ON()
DCHECK(!in_dtor_);
#endif
if (--ref_count_ == 0) {
#ifndef NDEBUG
#if DCHECK_IS_ON()
in_dtor_ = true;
#endif
return true;
@ -110,7 +108,7 @@ class RefCountedBase {
private:
mutable int ref_count_;
#ifndef NDEBUG
#if DCHECK_IS_ON()
mutable bool in_dtor_;
#endif
@ -134,7 +132,7 @@ class RefCountedThreadSafeBase {
private:
mutable AtomicRefCount ref_count_;
#ifndef NDEBUG
#if DCHECK_IS_ON()
mutable bool in_dtor_;
#endif

View File

@ -50,6 +50,7 @@
#include "include/base/cef_atomicops.h"
#include "include/base/cef_basictypes.h"
#include "include/base/cef_build.h"
#include "include/base/cef_logging.h"
#include "include/base/cef_macros.h"
// A helper class alongside macros to be used to verify assumptions about thread
@ -139,7 +140,7 @@
// };
#if !defined(NDEBUG)
#if DCHECK_IS_ON()
// Defines a class member that acts like a mutex. It is used only as a
// verification tool.

View File

@ -37,6 +37,7 @@
#define CEF_INCLUDE_WRAPPER_CEF_STREAM_RESOURCE_HANDLER_H_
#pragma once
#include "include/base/cef_logging.h"
#include "include/base/cef_macros.h"
#include "include/base/cef_scoped_ptr.h"
#include "include/cef_base.h"
@ -91,7 +92,7 @@ class CefStreamResourceHandler : public CefResourceHandler {
class Buffer;
SCOPED_PTR(Buffer) buffer_;
#ifndef NDEBUG
#if DCHECK_IS_ON()
// Used in debug builds to verify that |buffer_| isn't being accessed on
// multiple threads at the same time.
bool buffer_owned_by_file_thread_;

View File

@ -17,13 +17,13 @@
#include "extensions/browser/extension_protocols.h"
#include "extensions/common/constants.h"
#ifndef NDEBUG
#if DCHECK_IS_ON()
base::AtomicRefCount CefBrowserContext::DebugObjCt = 0;
#endif
CefBrowserContext::CefBrowserContext()
: extension_system_(NULL) {
#ifndef NDEBUG
#if DCHECK_IS_ON()
base::AtomicRefCountInc(&DebugObjCt);
#endif
}
@ -32,7 +32,7 @@ CefBrowserContext::~CefBrowserContext() {
// Should be cleared in Shutdown().
DCHECK(!resource_context_.get());
#ifndef NDEBUG
#if DCHECK_IS_ON()
base::AtomicRefCountDec(&DebugObjCt);
#endif
}

View File

@ -158,7 +158,7 @@ class CefBrowserContext
return extension_system_;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
// Simple tracking of allocated objects.
static base::AtomicRefCount DebugObjCt; // NOLINT(runtime/int)
#endif

View File

@ -347,7 +347,7 @@ void CefBrowserInfoManager::OnGetNewBrowserInfo(
return;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
// Verify that no request for the same route is currently queued.
{
PendingNewBrowserInfoList::const_iterator it =
@ -408,7 +408,7 @@ void CefBrowserInfoManager::DestroyAllBrowsers() {
}
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
{
// Verify that all browser windows have been destroyed.
base::AutoLock lock_scope(browser_info_lock_);

View File

@ -178,7 +178,7 @@ void CefBrowserMainParts::PostMainMessageLoopRun() {
global_browser_context_ = NULL;
#ifndef NDEBUG
#if DCHECK_IS_ON()
// No CefBrowserContext instances should exist at this point.
DCHECK_EQ(0, CefBrowserContext::DebugObjCt);
#endif
@ -190,7 +190,7 @@ void CefBrowserMainParts::PostDestroyThreads() {
delete views::ViewsDelegate::GetInstance();
#endif
#ifndef NDEBUG
#if DCHECK_IS_ON()
// No CefURLRequestContext instances should exist at this point.
DCHECK_EQ(0, CefURLRequestContext::DebugObjCt);
#endif

View File

@ -762,13 +762,13 @@ void CefMenuModelImpl::InsertItemAt(const Item& item, int index) {
}
void CefMenuModelImpl::ValidateItem(const Item& item) {
#ifndef NDEBUG
#if DCHECK_IS_ON()
if (item.type_ == MENUITEMTYPE_SEPARATOR) {
DCHECK_EQ(item.command_id_, kSeparatorId);
} else {
DCHECK_GE(item.command_id_, 0);
}
#endif // NDEBUG
#endif
}
void CefMenuModelImpl::OnMenuClosed() {

View File

@ -4,18 +4,18 @@
#include "libcef/browser/net/url_request_context.h"
#ifndef NDEBUG
#if DCHECK_IS_ON()
base::AtomicRefCount CefURLRequestContext::DebugObjCt = 0;
#endif
CefURLRequestContext::CefURLRequestContext() {
#ifndef NDEBUG
#if DCHECK_IS_ON()
base::AtomicRefCountInc(&DebugObjCt);
#endif
}
CefURLRequestContext::~CefURLRequestContext() {
#ifndef NDEBUG
#if DCHECK_IS_ON()
base::AtomicRefCountDec(&DebugObjCt);
#endif
}

View File

@ -6,6 +6,7 @@
#define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_H_
#pragma once
#include "base/logging.h"
#include "net/url_request/url_request_context.h"
// Owns URLRequest instances and provides access to network-related
@ -18,7 +19,7 @@ class CefURLRequestContext : public net::URLRequestContext {
CefURLRequestContext();
~CefURLRequestContext() override;
#ifndef NDEBUG
#if DCHECK_IS_ON()
// Simple tracking of allocated objects.
static base::AtomicRefCount DebugObjCt; // NOLINT(runtime/int)
#endif

View File

@ -274,7 +274,7 @@ net::URLRequestJob* CefURLRequestManager::GetRequestJob(
job = GetBuiltinSchemeRequestJob(request, network_delegate, scheme);
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
if (job)
DLOG(INFO) << "CefURLRequestManager hit for " << request->url().spec();
#endif

View File

@ -6,11 +6,11 @@
// is functionally a wrapper around the LockImpl class, so the only
// real intelligence in the class is in the debugging logic.
#if !defined(NDEBUG)
#include "include/base/cef_lock.h"
#include "include/base/cef_logging.h"
#if DCHECK_IS_ON()
namespace base {
namespace cef_internal {
@ -43,4 +43,4 @@ void Lock::CheckUnheldAndMark() {
} // namespace cef_internal
} // namespace base
#endif // NDEBUG
#endif // DCHECK_IS_ON()

View File

@ -48,7 +48,7 @@ namespace base {
namespace cef_internal {
LockImpl::LockImpl() {
#ifndef NDEBUG
#if DCHECK_IS_ON()
// In debug, setup attributes for lock error checking.
pthread_mutexattr_t mta;
int rv = pthread_mutexattr_init(&mta);

View File

@ -15,32 +15,32 @@ bool RefCountedThreadSafeBase::HasOneRef() const {
}
RefCountedThreadSafeBase::RefCountedThreadSafeBase() : ref_count_(0) {
#ifndef NDEBUG
#if DCHECK_IS_ON()
in_dtor_ = false;
#endif
}
RefCountedThreadSafeBase::~RefCountedThreadSafeBase() {
#ifndef NDEBUG
#if DCHECK_IS_ON()
DCHECK(in_dtor_) << "RefCountedThreadSafe object deleted without "
"calling Release()";
#endif
}
void RefCountedThreadSafeBase::AddRef() const {
#ifndef NDEBUG
#if DCHECK_IS_ON()
DCHECK(!in_dtor_);
#endif
AtomicRefCountInc(&ref_count_);
}
bool RefCountedThreadSafeBase::Release() const {
#ifndef NDEBUG
#if DCHECK_IS_ON()
DCHECK(!in_dtor_);
DCHECK(!AtomicRefCountIsZero(&ref_count_));
#endif
if (!AtomicRefCountDec(&ref_count_)) {
#ifndef NDEBUG
#if DCHECK_IS_ON()
in_dtor_ = true;
#endif
return true;

View File

@ -127,7 +127,7 @@ template<> CefRefPtr<CefApp> CefCppToC<CefAppCppToC, CefApp,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefAppCppToC, CefApp,
cef_app_t>::DebugObjCt = 0;
#endif

View File

@ -67,7 +67,7 @@ template<> CefRefPtr<CefAuthCallback> CefCppToC<CefAuthCallbackCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefAuthCallbackCppToC,
CefAuthCallback, cef_auth_callback_t>::DebugObjCt = 0;
#endif

View File

@ -13,7 +13,7 @@ template<> CefRefPtr<CefBase> CefCppToC<CefBaseCppToC, CefBase, cef_base_t>::
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefBaseCppToC, CefBase,
cef_base_t>::DebugObjCt = 0;
#endif

View File

@ -49,7 +49,7 @@ template<> CefRefPtr<CefBeforeDownloadCallback> CefCppToC<CefBeforeDownloadCallb
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefBeforeDownloadCallbackCppToC,
CefBeforeDownloadCallback, cef_before_download_callback_t>::DebugObjCt =
0;

View File

@ -179,7 +179,7 @@ template<> CefRefPtr<CefBinaryValue> CefCppToC<CefBinaryValueCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefBinaryValueCppToC, CefBinaryValue,
cef_binary_value_t>::DebugObjCt = 0;
#endif

View File

@ -389,7 +389,7 @@ template<> CefRefPtr<CefBrowser> CefCppToC<CefBrowserCppToC, CefBrowser,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefBrowserCppToC, CefBrowser,
cef_browser_t>::DebugObjCt = 0;
#endif

View File

@ -1012,7 +1012,7 @@ template<> CefRefPtr<CefBrowserHost> CefCppToC<CefBrowserHostCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefBrowserHostCppToC, CefBrowserHost,
cef_browser_host_t>::DebugObjCt = 0;
#endif

View File

@ -121,7 +121,7 @@ template<> CefRefPtr<CefBrowserProcessHandler> CefCppToC<CefBrowserProcessHandle
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefBrowserProcessHandlerCppToC,
CefBrowserProcessHandler, cef_browser_process_handler_t>::DebugObjCt = 0;
#endif

View File

@ -55,7 +55,7 @@ template<> CefRefPtr<CefCallback> CefCppToC<CefCallbackCppToC, CefCallback,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefCallbackCppToC, CefCallback,
cef_callback_t>::DebugObjCt = 0;
#endif

View File

@ -313,7 +313,7 @@ template<> CefRefPtr<CefClient> CefCppToC<CefClientCppToC, CefClient,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefClientCppToC, CefClient,
cef_client_t>::DebugObjCt = 0;
#endif

View File

@ -429,7 +429,7 @@ template<> CefRefPtr<CefCommandLine> CefCppToC<CefCommandLineCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefCommandLineCppToC, CefCommandLine,
cef_command_line_t>::DebugObjCt = 0;
#endif

View File

@ -45,7 +45,7 @@ template<> CefRefPtr<CefCompletionCallback> CefCppToC<CefCompletionCallbackCppTo
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefCompletionCallbackCppToC,
CefCompletionCallback, cef_completion_callback_t>::DebugObjCt = 0;
#endif

View File

@ -178,7 +178,7 @@ template<> CefRefPtr<CefContextMenuHandler> CefCppToC<CefContextMenuHandlerCppTo
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefContextMenuHandlerCppToC,
CefContextMenuHandler, cef_context_menu_handler_t>::DebugObjCt = 0;
#endif

View File

@ -377,7 +377,7 @@ template<> CefRefPtr<CefContextMenuParams> CefCppToC<CefContextMenuParamsCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefContextMenuParamsCppToC,
CefContextMenuParams, cef_context_menu_params_t>::DebugObjCt = 0;
#endif

View File

@ -241,7 +241,7 @@ template<> CefRefPtr<CefCookieManager> CefCppToC<CefCookieManagerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefCookieManagerCppToC,
CefCookieManager, cef_cookie_manager_t>::DebugObjCt = 0;
#endif

View File

@ -72,7 +72,7 @@ template<> CefRefPtr<CefCookieVisitor> CefCppToC<CefCookieVisitorCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefCookieVisitorCppToC,
CefCookieVisitor, cef_cookie_visitor_t>::DebugObjCt = 0;
#endif

View File

@ -89,7 +89,7 @@ class CefCppToC : public CefBase {
}
bool HasOneRef() const { return UnderlyingHasOneRef(); }
#ifndef NDEBUG
#if DCHECK_IS_ON()
// Simple tracking of allocated objects.
static base::AtomicRefCount DebugObjCt; // NOLINT(runtime/int)
#endif
@ -106,13 +106,13 @@ class CefCppToC : public CefBase {
base->release = struct_release;
base->has_one_ref = struct_has_one_ref;
#ifndef NDEBUG
#if DCHECK_IS_ON()
base::AtomicRefCountInc(&DebugObjCt);
#endif
}
virtual ~CefCppToC() {
#ifndef NDEBUG
#if DCHECK_IS_ON()
base::AtomicRefCountDec(&DebugObjCt);
#endif
}

View File

@ -46,7 +46,7 @@ template<> CefRefPtr<CefDeleteCookiesCallback> CefCppToC<CefDeleteCookiesCallbac
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDeleteCookiesCallbackCppToC,
CefDeleteCookiesCallback, cef_delete_cookies_callback_t>::DebugObjCt = 0;
#endif

View File

@ -78,7 +78,7 @@ template<> CefRefPtr<CefDialogHandler> CefCppToC<CefDialogHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDialogHandlerCppToC,
CefDialogHandler, cef_dialog_handler_t>::DebugObjCt = 0;
#endif

View File

@ -670,7 +670,7 @@ template<> CefRefPtr<CefDictionaryValue> CefCppToC<CefDictionaryValueCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDictionaryValueCppToC,
CefDictionaryValue, cef_dictionary_value_t>::DebugObjCt = 0;
#endif

View File

@ -204,7 +204,7 @@ template<> CefRefPtr<CefDisplayHandler> CefCppToC<CefDisplayHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDisplayHandlerCppToC,
CefDisplayHandler, cef_display_handler_t>::DebugObjCt = 0;
#endif

View File

@ -270,7 +270,7 @@ template<> CefRefPtr<CefDOMDocument> CefCppToC<CefDOMDocumentCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDOMDocumentCppToC, CefDOMDocument,
cef_domdocument_t>::DebugObjCt = 0;
#endif

View File

@ -469,7 +469,7 @@ template<> CefRefPtr<CefDOMNode> CefCppToC<CefDOMNodeCppToC, CefDOMNode,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDOMNodeCppToC, CefDOMNode,
cef_domnode_t>::DebugObjCt = 0;
#endif

View File

@ -51,7 +51,7 @@ template<> CefRefPtr<CefDOMVisitor> CefCppToC<CefDOMVisitorCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDOMVisitorCppToC, CefDOMVisitor,
cef_domvisitor_t>::DebugObjCt = 0;
#endif

View File

@ -102,7 +102,7 @@ template<> CefRefPtr<CefDownloadHandler> CefCppToC<CefDownloadHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDownloadHandlerCppToC,
CefDownloadHandler, cef_download_handler_t>::DebugObjCt = 0;
#endif

View File

@ -56,7 +56,7 @@ template<> CefRefPtr<CefDownloadImageCallback> CefCppToC<CefDownloadImageCallbac
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDownloadImageCallbackCppToC,
CefDownloadImageCallback, cef_download_image_callback_t>::DebugObjCt = 0;
#endif

View File

@ -71,7 +71,7 @@ template<> CefRefPtr<CefDownloadItemCallback> CefCppToC<CefDownloadItemCallbackC
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDownloadItemCallbackCppToC,
CefDownloadItemCallback, cef_download_item_callback_t>::DebugObjCt = 0;
#endif

View File

@ -300,7 +300,7 @@ template<> CefRefPtr<CefDownloadItem> CefCppToC<CefDownloadItemCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDownloadItemCppToC,
CefDownloadItem, cef_download_item_t>::DebugObjCt = 0;
#endif

View File

@ -403,7 +403,7 @@ template<> CefRefPtr<CefDragData> CefCppToC<CefDragDataCppToC, CefDragData,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDragDataCppToC, CefDragData,
cef_drag_data_t>::DebugObjCt = 0;
#endif

View File

@ -96,7 +96,7 @@ template<> CefRefPtr<CefDragHandler> CefCppToC<CefDragHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDragHandlerCppToC, CefDragHandler,
cef_drag_handler_t>::DebugObjCt = 0;
#endif

View File

@ -52,7 +52,7 @@ template<> CefRefPtr<CefEndTracingCallback> CefCppToC<CefEndTracingCallbackCppTo
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefEndTracingCallbackCppToC,
CefEndTracingCallback, cef_end_tracing_callback_t>::DebugObjCt = 0;
#endif

View File

@ -71,7 +71,7 @@ template<> CefRefPtr<CefFileDialogCallback> CefCppToC<CefFileDialogCallbackCppTo
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefFileDialogCallbackCppToC,
CefFileDialogCallback, cef_file_dialog_callback_t>::DebugObjCt = 0;
#endif

View File

@ -65,7 +65,7 @@ template<> CefRefPtr<CefFindHandler> CefCppToC<CefFindHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefFindHandlerCppToC, CefFindHandler,
cef_find_handler_t>::DebugObjCt = 0;
#endif

View File

@ -92,7 +92,7 @@ template<> CefRefPtr<CefFocusHandler> CefCppToC<CefFocusHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefFocusHandlerCppToC,
CefFocusHandler, cef_focus_handler_t>::DebugObjCt = 0;
#endif

View File

@ -403,7 +403,7 @@ template<> CefRefPtr<CefFrame> CefCppToC<CefFrameCppToC, CefFrame,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefFrameCppToC, CefFrame,
cef_frame_t>::DebugObjCt = 0;
#endif

View File

@ -46,7 +46,7 @@ template<> CefRefPtr<CefGeolocationCallback> CefCppToC<CefGeolocationCallbackCpp
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefGeolocationCallbackCppToC,
CefGeolocationCallback, cef_geolocation_callback_t>::DebugObjCt = 0;
#endif

View File

@ -91,7 +91,7 @@ template<> CefRefPtr<CefGeolocationHandler> CefCppToC<CefGeolocationHandlerCppTo
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefGeolocationHandlerCppToC,
CefGeolocationHandler, cef_geolocation_handler_t>::DebugObjCt = 0;
#endif

View File

@ -56,7 +56,7 @@ template<> CefRefPtr<CefGetGeolocationCallback> CefCppToC<CefGetGeolocationCallb
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefGetGeolocationCallbackCppToC,
CefGetGeolocationCallback, cef_get_geolocation_callback_t>::DebugObjCt =
0;

View File

@ -394,7 +394,7 @@ template<> CefRefPtr<CefImage> CefCppToC<CefImageCppToC, CefImage,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefImageCppToC, CefImage,
cef_image_t>::DebugObjCt = 0;
#endif

View File

@ -48,7 +48,7 @@ template<> CefRefPtr<CefJSDialogCallback> CefCppToC<CefJSDialogCallbackCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefJSDialogCallbackCppToC,
CefJSDialogCallback, cef_jsdialog_callback_t>::DebugObjCt = 0;
#endif

View File

@ -149,7 +149,7 @@ template<> CefRefPtr<CefJSDialogHandler> CefCppToC<CefJSDialogHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefJSDialogHandlerCppToC,
CefJSDialogHandler, cef_jsdialog_handler_t>::DebugObjCt = 0;
#endif

View File

@ -112,7 +112,7 @@ template<> CefRefPtr<CefKeyboardHandler> CefCppToC<CefKeyboardHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefKeyboardHandlerCppToC,
CefKeyboardHandler, cef_keyboard_handler_t>::DebugObjCt = 0;
#endif

View File

@ -195,7 +195,7 @@ template<> CefRefPtr<CefLifeSpanHandler> CefCppToC<CefLifeSpanHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefLifeSpanHandlerCppToC,
CefLifeSpanHandler, cef_life_span_handler_t>::DebugObjCt = 0;
#endif

View File

@ -621,7 +621,7 @@ template<> CefRefPtr<CefListValue> CefCppToC<CefListValueCppToC, CefListValue,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefListValueCppToC, CefListValue,
cef_list_value_t>::DebugObjCt = 0;
#endif

View File

@ -137,7 +137,7 @@ template<> CefRefPtr<CefLoadHandler> CefCppToC<CefLoadHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefLoadHandlerCppToC, CefLoadHandler,
cef_load_handler_t>::DebugObjCt = 0;
#endif

View File

@ -1044,7 +1044,7 @@ template<> CefRefPtr<CefMenuModel> CefCppToC<CefMenuModelCppToC, CefMenuModel,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefMenuModelCppToC, CefMenuModel,
cef_menu_model_t>::DebugObjCt = 0;
#endif

View File

@ -72,7 +72,7 @@ template<> CefRefPtr<CefMenuModelDelegate> CefCppToC<CefMenuModelDelegateCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefMenuModelDelegateCppToC,
CefMenuModelDelegate, cef_menu_model_delegate_t>::DebugObjCt = 0;
#endif

View File

@ -177,7 +177,7 @@ template<> CefRefPtr<CefNavigationEntry> CefCppToC<CefNavigationEntryCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefNavigationEntryCppToC,
CefNavigationEntry, cef_navigation_entry_t>::DebugObjCt = 0;
#endif

View File

@ -59,7 +59,7 @@ template<> CefRefPtr<CefNavigationEntryVisitor> CefCppToC<CefNavigationEntryVisi
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefNavigationEntryVisitorCppToC,
CefNavigationEntryVisitor, cef_navigation_entry_visitor_t>::DebugObjCt =
0;

View File

@ -51,7 +51,7 @@ template<> CefRefPtr<CefPdfPrintCallback> CefCppToC<CefPdfPrintCallbackCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefPdfPrintCallbackCppToC,
CefPdfPrintCallback, cef_pdf_print_callback_t>::DebugObjCt = 0;
#endif

View File

@ -1,67 +0,0 @@
// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
//
// ---------------------------------------------------------------------------
//
// This file was generated by the CEF translator tool. If making changes by
// hand only do so within the body of existing method and function
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
#include "libcef_dll/cpptoc/permission_handler_cpptoc.h"
#include "libcef_dll/ctocpp/browser_ctocpp.h"
#include "libcef_dll/ctocpp/frame_ctocpp.h"
// MEMBER FUNCTIONS - Body may be edited by hand.
int CEF_CALLBACK permission_handler_on_before_script_extension_load(
struct _cef_permission_handler_t* self, cef_browser_t* browser,
cef_frame_t* frame, const cef_string_t* extensionName) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self)
return 0;
// Verify param: browser; type: refptr_diff
DCHECK(browser);
if (!browser)
return 0;
// Verify param: frame; type: refptr_diff
DCHECK(frame);
if (!frame)
return 0;
// Verify param: extensionName; type: string_byref_const
DCHECK(extensionName);
if (!extensionName)
return 0;
// Execute
bool _retval = CefPermissionHandlerCppToC::Get(
self)->OnBeforeScriptExtensionLoad(
CefBrowserCToCpp::Wrap(browser),
CefFrameCToCpp::Wrap(frame),
CefString(extensionName));
// Return type: bool
return _retval;
}
// CONSTRUCTOR - Do not edit by hand.
CefPermissionHandlerCppToC::CefPermissionHandlerCppToC(
CefPermissionHandler* cls)
: CefCppToC<CefPermissionHandlerCppToC, CefPermissionHandler,
cef_permission_handler_t>(cls) {
struct_.struct_.on_before_script_extension_load =
permission_handler_on_before_script_extension_load;
}
#ifndef NDEBUG
template<> long CefCppToC<CefPermissionHandlerCppToC, CefPermissionHandler,
cef_permission_handler_t>::DebugObjCt = 0;
#endif

View File

@ -1,41 +0,0 @@
// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
//
// ---------------------------------------------------------------------------
//
// This file was generated by the CEF translator tool. If making changes by
// hand only do so within the body of existing method and function
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
#ifndef CEF_LIBCEF_DLL_CPPTOC_PERMISSION_HANDLER_CPPTOC_H_
#define CEF_LIBCEF_DLL_CPPTOC_PERMISSION_HANDLER_CPPTOC_H_
#pragma once
#ifndef USING_CEF_SHARED
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
#else // USING_CEF_SHARED
#include "include/cef_permission_handler.h"
#include "include/capi/cef_permission_handler_capi.h"
#include "include/cef_browser.h"
#include "include/capi/cef_browser_capi.h"
#include "include/cef_frame.h"
#include "include/capi/cef_frame_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed wrapper-side only.
class CefPermissionHandlerCppToC
: public CefCppToC<CefPermissionHandlerCppToC, CefPermissionHandler,
cef_permission_handler_t> {
public:
explicit CefPermissionHandlerCppToC(CefPermissionHandler* cls);
virtual ~CefPermissionHandlerCppToC() {}
};
#endif // USING_CEF_SHARED
#endif // CEF_LIBCEF_DLL_CPPTOC_PERMISSION_HANDLER_CPPTOC_H_

View File

@ -182,7 +182,7 @@ template<> CefRefPtr<CefPostData> CefCppToC<CefPostDataCppToC, CefPostData,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefPostDataCppToC, CefPostData,
cef_post_data_t>::DebugObjCt = 0;
#endif

View File

@ -182,7 +182,7 @@ template<> CefRefPtr<CefPostDataElement> CefCppToC<CefPostDataElementCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefPostDataElementCppToC,
CefPostDataElement, cef_post_data_element_t>::DebugObjCt = 0;
#endif

View File

@ -65,7 +65,7 @@ template<> CefRefPtr<CefPrintDialogCallback> CefCppToC<CefPrintDialogCallbackCpp
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefPrintDialogCallbackCppToC,
CefPrintDialogCallback, cef_print_dialog_callback_t>::DebugObjCt = 0;
#endif

View File

@ -159,7 +159,7 @@ template<> CefRefPtr<CefPrintHandler> CefCppToC<CefPrintHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefPrintHandlerCppToC,
CefPrintHandler, cef_print_handler_t>::DebugObjCt = 0;
#endif

View File

@ -45,7 +45,7 @@ template<> CefRefPtr<CefPrintJobCallback> CefCppToC<CefPrintJobCallbackCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefPrintJobCallbackCppToC,
CefPrintJobCallback, cef_print_job_callback_t>::DebugObjCt = 0;
#endif

View File

@ -450,7 +450,7 @@ template<> CefRefPtr<CefPrintSettings> CefCppToC<CefPrintSettingsCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefPrintSettingsCppToC,
CefPrintSettings, cef_print_settings_t>::DebugObjCt = 0;
#endif

View File

@ -134,7 +134,7 @@ template<> CefRefPtr<CefProcessMessage> CefCppToC<CefProcessMessageCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefProcessMessageCppToC,
CefProcessMessage, cef_process_message_t>::DebugObjCt = 0;
#endif

View File

@ -118,7 +118,7 @@ template<> CefRefPtr<CefReadHandler> CefCppToC<CefReadHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefReadHandlerCppToC, CefReadHandler,
cef_read_handler_t>::DebugObjCt = 0;
#endif

View File

@ -377,7 +377,7 @@ template<> CefRefPtr<CefRenderHandler> CefCppToC<CefRenderHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefRenderHandlerCppToC,
CefRenderHandler, cef_render_handler_t>::DebugObjCt = 0;
#endif

View File

@ -319,7 +319,7 @@ template<> CefRefPtr<CefRenderProcessHandler> CefCppToC<CefRenderProcessHandlerC
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefRenderProcessHandlerCppToC,
CefRenderProcessHandler, cef_render_process_handler_t>::DebugObjCt = 0;
#endif

View File

@ -59,7 +59,7 @@ template<> CefRefPtr<CefRequestCallback> CefCppToC<CefRequestCallbackCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefRequestCallbackCppToC,
CefRequestCallback, cef_request_callback_t>::DebugObjCt = 0;
#endif

View File

@ -476,7 +476,7 @@ template<> CefRefPtr<CefRequestContext> CefCppToC<CefRequestContextCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefRequestContextCppToC,
CefRequestContext, cef_request_context_t>::DebugObjCt = 0;
#endif

View File

@ -89,7 +89,7 @@ template<> CefRefPtr<CefRequestContextHandler> CefCppToC<CefRequestContextHandle
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefRequestContextHandlerCppToC,
CefRequestContextHandler, cef_request_context_handler_t>::DebugObjCt = 0;
#endif

View File

@ -410,7 +410,7 @@ template<> CefRefPtr<CefRequest> CefCppToC<CefRequestCppToC, CefRequest,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefRequestCppToC, CefRequest,
cef_request_t>::DebugObjCt = 0;
#endif

View File

@ -553,7 +553,7 @@ template<> CefRefPtr<CefRequestHandler> CefCppToC<CefRequestHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefRequestHandlerCppToC,
CefRequestHandler, cef_request_handler_t>::DebugObjCt = 0;
#endif

View File

@ -54,7 +54,7 @@ template<> CefRefPtr<CefResolveCallback> CefCppToC<CefResolveCallbackCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefResolveCallbackCppToC,
CefResolveCallback, cef_resolve_callback_t>::DebugObjCt = 0;
#endif

View File

@ -144,7 +144,7 @@ template<> CefRefPtr<CefResourceBundle> CefCppToC<CefResourceBundleCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefResourceBundleCppToC,
CefResourceBundle, cef_resource_bundle_t>::DebugObjCt = 0;
#endif

View File

@ -142,7 +142,7 @@ template<> CefRefPtr<CefResourceBundleHandler> CefCppToC<CefResourceBundleHandle
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefResourceBundleHandlerCppToC,
CefResourceBundleHandler, cef_resource_bundle_handler_t>::DebugObjCt = 0;
#endif

View File

@ -205,7 +205,7 @@ template<> CefRefPtr<CefResourceHandler> CefCppToC<CefResourceHandlerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefResourceHandlerCppToC,
CefResourceHandler, cef_resource_handler_t>::DebugObjCt = 0;
#endif

View File

@ -255,7 +255,7 @@ template<> CefRefPtr<CefResponse> CefCppToC<CefResponseCppToC, CefResponse,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefResponseCppToC, CefResponse,
cef_response_t>::DebugObjCt = 0;
#endif

View File

@ -98,7 +98,7 @@ template<> CefRefPtr<CefResponseFilter> CefCppToC<CefResponseFilterCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefResponseFilterCppToC,
CefResponseFilter, cef_response_filter_t>::DebugObjCt = 0;
#endif

View File

@ -61,7 +61,7 @@ template<> CefRefPtr<CefRunContextMenuCallback> CefCppToC<CefRunContextMenuCallb
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefRunContextMenuCallbackCppToC,
CefRunContextMenuCallback, cef_run_context_menu_callback_t>::DebugObjCt =
0;

View File

@ -59,7 +59,7 @@ template<> CefRefPtr<CefRunFileDialogCallback> CefCppToC<CefRunFileDialogCallbac
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefRunFileDialogCallbackCppToC,
CefRunFileDialogCallback, cef_run_file_dialog_callback_t>::DebugObjCt = 0;
#endif

View File

@ -68,7 +68,7 @@ template<> CefRefPtr<CefSchemeHandlerFactory> CefCppToC<CefSchemeHandlerFactoryC
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefSchemeHandlerFactoryCppToC,
CefSchemeHandlerFactory, cef_scheme_handler_factory_t>::DebugObjCt = 0;
#endif

View File

@ -57,7 +57,7 @@ template<> CefRefPtr<CefSchemeRegistrar> CefCppToC<CefSchemeRegistrarCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefSchemeRegistrarCppToC,
CefSchemeRegistrar, cef_scheme_registrar_t>::DebugObjCt = 0;
#endif

View File

@ -46,7 +46,7 @@ template<> CefRefPtr<CefSetCookieCallback> CefCppToC<CefSetCookieCallbackCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefSetCookieCallbackCppToC,
CefSetCookieCallback, cef_set_cookie_callback_t>::DebugObjCt = 0;
#endif

View File

@ -221,7 +221,7 @@ template<> CefRefPtr<CefSSLCertPrincipal> CefCppToC<CefSSLCertPrincipalCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefSSLCertPrincipalCppToC,
CefSSLCertPrincipal, cef_sslcert_principal_t>::DebugObjCt = 0;
#endif

View File

@ -287,7 +287,7 @@ template<> CefRefPtr<CefSSLInfo> CefCppToC<CefSSLInfoCppToC, CefSSLInfo,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefSSLInfoCppToC, CefSSLInfo,
cef_sslinfo_t>::DebugObjCt = 0;
#endif

View File

@ -174,7 +174,7 @@ template<> CefRefPtr<CefStreamReader> CefCppToC<CefStreamReaderCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefStreamReaderCppToC,
CefStreamReader, cef_stream_reader_t>::DebugObjCt = 0;
#endif

View File

@ -156,7 +156,7 @@ template<> CefRefPtr<CefStreamWriter> CefCppToC<CefStreamWriterCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefStreamWriterCppToC,
CefStreamWriter, cef_stream_writer_t>::DebugObjCt = 0;
#endif

View File

@ -47,7 +47,7 @@ template<> CefRefPtr<CefStringVisitor> CefCppToC<CefStringVisitorCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefStringVisitorCppToC,
CefStringVisitor, cef_string_visitor_t>::DebugObjCt = 0;
#endif

View File

@ -43,7 +43,7 @@ template<> CefRefPtr<CefTask> CefCppToC<CefTaskCppToC, CefTask,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefTaskCppToC, CefTask,
cef_task_t>::DebugObjCt = 0;
#endif

View File

@ -156,7 +156,7 @@ template<> CefRefPtr<CefTaskRunner> CefCppToC<CefTaskRunnerCppToC,
return NULL;
}
#ifndef NDEBUG
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefTaskRunnerCppToC, CefTaskRunner,
cef_task_runner_t>::DebugObjCt = 0;
#endif

Some files were not shown because too many files have changed in this diff Show More