mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Rename CefBase to CefBaseRefCounted (issue #2090)
This commit is contained in:
@ -1501,7 +1501,7 @@ CefTranslatorTestCppToC::CefTranslatorTestCppToC() {
|
||||
translator_test_set_raw_ptr_client_list;
|
||||
}
|
||||
|
||||
template<> CefRefPtr<CefTranslatorTest> CefCppToC<CefTranslatorTestCppToC,
|
||||
template<> CefRefPtr<CefTranslatorTest> CefCppToCRefCounted<CefTranslatorTestCppToC,
|
||||
CefTranslatorTest, cef_translator_test_t>::UnwrapDerived(
|
||||
CefWrapperType type, cef_translator_test_t* s) {
|
||||
NOTREACHED() << "Unexpected class type: " << type;
|
||||
@ -1509,9 +1509,10 @@ template<> CefRefPtr<CefTranslatorTest> CefCppToC<CefTranslatorTestCppToC,
|
||||
}
|
||||
|
||||
#if DCHECK_IS_ON()
|
||||
template<> base::AtomicRefCount CefCppToC<CefTranslatorTestCppToC,
|
||||
template<> base::AtomicRefCount CefCppToCRefCounted<CefTranslatorTestCppToC,
|
||||
CefTranslatorTest, cef_translator_test_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
||||
template<> CefWrapperType CefCppToC<CefTranslatorTestCppToC, CefTranslatorTest,
|
||||
cef_translator_test_t>::kWrapperType = WT_TRANSLATOR_TEST;
|
||||
template<> CefWrapperType CefCppToCRefCounted<CefTranslatorTestCppToC,
|
||||
CefTranslatorTest, cef_translator_test_t>::kWrapperType =
|
||||
WT_TRANSLATOR_TEST;
|
||||
|
@ -20,12 +20,12 @@
|
||||
|
||||
#include "include/test/cef_translator_test.h"
|
||||
#include "include/capi/test/cef_translator_test_capi.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
|
||||
|
||||
// Wrap a C++ class with a C structure.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
class CefTranslatorTestCppToC
|
||||
: public CefCppToC<CefTranslatorTestCppToC, CefTranslatorTest,
|
||||
: public CefCppToCRefCounted<CefTranslatorTestCppToC, CefTranslatorTest,
|
||||
cef_translator_test_t> {
|
||||
public:
|
||||
CefTranslatorTestCppToC();
|
||||
|
@ -62,7 +62,7 @@ CefTranslatorTestRefPtrClientChildCppToC::CefTranslatorTestRefPtrClientChildCppT
|
||||
GetStruct()->base.get_value = translator_test_ref_ptr_client_child_get_value;
|
||||
}
|
||||
|
||||
template<> CefRefPtr<CefTranslatorTestRefPtrClientChild> CefCppToC<CefTranslatorTestRefPtrClientChildCppToC,
|
||||
template<> CefRefPtr<CefTranslatorTestRefPtrClientChild> CefCppToCRefCounted<CefTranslatorTestRefPtrClientChildCppToC,
|
||||
CefTranslatorTestRefPtrClientChild,
|
||||
cef_translator_test_ref_ptr_client_child_t>::UnwrapDerived(
|
||||
CefWrapperType type, cef_translator_test_ref_ptr_client_child_t* s) {
|
||||
@ -71,12 +71,12 @@ template<> CefRefPtr<CefTranslatorTestRefPtrClientChild> CefCppToC<CefTranslator
|
||||
}
|
||||
|
||||
#if DCHECK_IS_ON()
|
||||
template<> base::AtomicRefCount CefCppToC<CefTranslatorTestRefPtrClientChildCppToC,
|
||||
template<> base::AtomicRefCount CefCppToCRefCounted<CefTranslatorTestRefPtrClientChildCppToC,
|
||||
CefTranslatorTestRefPtrClientChild,
|
||||
cef_translator_test_ref_ptr_client_child_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
||||
template<> CefWrapperType CefCppToC<CefTranslatorTestRefPtrClientChildCppToC,
|
||||
template<> CefWrapperType CefCppToCRefCounted<CefTranslatorTestRefPtrClientChildCppToC,
|
||||
CefTranslatorTestRefPtrClientChild,
|
||||
cef_translator_test_ref_ptr_client_child_t>::kWrapperType =
|
||||
WT_TRANSLATOR_TEST_REF_PTR_CLIENT_CHILD;
|
||||
|
@ -20,12 +20,12 @@
|
||||
|
||||
#include "include/test/cef_translator_test.h"
|
||||
#include "include/capi/test/cef_translator_test_capi.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
|
||||
|
||||
// Wrap a C++ class with a C structure.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
class CefTranslatorTestRefPtrClientChildCppToC
|
||||
: public CefCppToC<CefTranslatorTestRefPtrClientChildCppToC,
|
||||
: public CefCppToCRefCounted<CefTranslatorTestRefPtrClientChildCppToC,
|
||||
CefTranslatorTestRefPtrClientChild,
|
||||
cef_translator_test_ref_ptr_client_child_t> {
|
||||
public:
|
||||
|
@ -42,7 +42,7 @@ CefTranslatorTestRefPtrClientCppToC::CefTranslatorTestRefPtrClientCppToC() {
|
||||
GetStruct()->get_value = translator_test_ref_ptr_client_get_value;
|
||||
}
|
||||
|
||||
template<> CefRefPtr<CefTranslatorTestRefPtrClient> CefCppToC<CefTranslatorTestRefPtrClientCppToC,
|
||||
template<> CefRefPtr<CefTranslatorTestRefPtrClient> CefCppToCRefCounted<CefTranslatorTestRefPtrClientCppToC,
|
||||
CefTranslatorTestRefPtrClient,
|
||||
cef_translator_test_ref_ptr_client_t>::UnwrapDerived(CefWrapperType type,
|
||||
cef_translator_test_ref_ptr_client_t* s) {
|
||||
@ -55,12 +55,12 @@ template<> CefRefPtr<CefTranslatorTestRefPtrClient> CefCppToC<CefTranslatorTestR
|
||||
}
|
||||
|
||||
#if DCHECK_IS_ON()
|
||||
template<> base::AtomicRefCount CefCppToC<CefTranslatorTestRefPtrClientCppToC,
|
||||
template<> base::AtomicRefCount CefCppToCRefCounted<CefTranslatorTestRefPtrClientCppToC,
|
||||
CefTranslatorTestRefPtrClient,
|
||||
cef_translator_test_ref_ptr_client_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
||||
template<> CefWrapperType CefCppToC<CefTranslatorTestRefPtrClientCppToC,
|
||||
template<> CefWrapperType CefCppToCRefCounted<CefTranslatorTestRefPtrClientCppToC,
|
||||
CefTranslatorTestRefPtrClient,
|
||||
cef_translator_test_ref_ptr_client_t>::kWrapperType =
|
||||
WT_TRANSLATOR_TEST_REF_PTR_CLIENT;
|
||||
|
@ -20,12 +20,12 @@
|
||||
|
||||
#include "include/test/cef_translator_test.h"
|
||||
#include "include/capi/test/cef_translator_test_capi.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
|
||||
|
||||
// Wrap a C++ class with a C structure.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
class CefTranslatorTestRefPtrClientCppToC
|
||||
: public CefCppToC<CefTranslatorTestRefPtrClientCppToC,
|
||||
: public CefCppToCRefCounted<CefTranslatorTestRefPtrClientCppToC,
|
||||
CefTranslatorTestRefPtrClient, cef_translator_test_ref_ptr_client_t> {
|
||||
public:
|
||||
CefTranslatorTestRefPtrClientCppToC();
|
||||
|
@ -150,7 +150,7 @@ CefTranslatorTestRefPtrLibraryChildChildCppToC::CefTranslatorTestRefPtrLibraryCh
|
||||
translator_test_ref_ptr_library_child_child_set_value;
|
||||
}
|
||||
|
||||
template<> CefRefPtr<CefTranslatorTestRefPtrLibraryChildChild> CefCppToC<CefTranslatorTestRefPtrLibraryChildChildCppToC,
|
||||
template<> CefRefPtr<CefTranslatorTestRefPtrLibraryChildChild> CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryChildChildCppToC,
|
||||
CefTranslatorTestRefPtrLibraryChildChild,
|
||||
cef_translator_test_ref_ptr_library_child_child_t>::UnwrapDerived(
|
||||
CefWrapperType type,
|
||||
@ -160,12 +160,12 @@ template<> CefRefPtr<CefTranslatorTestRefPtrLibraryChildChild> CefCppToC<CefTran
|
||||
}
|
||||
|
||||
#if DCHECK_IS_ON()
|
||||
template<> base::AtomicRefCount CefCppToC<CefTranslatorTestRefPtrLibraryChildChildCppToC,
|
||||
template<> base::AtomicRefCount CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryChildChildCppToC,
|
||||
CefTranslatorTestRefPtrLibraryChildChild,
|
||||
cef_translator_test_ref_ptr_library_child_child_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
||||
template<> CefWrapperType CefCppToC<CefTranslatorTestRefPtrLibraryChildChildCppToC,
|
||||
template<> CefWrapperType CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryChildChildCppToC,
|
||||
CefTranslatorTestRefPtrLibraryChildChild,
|
||||
cef_translator_test_ref_ptr_library_child_child_t>::kWrapperType =
|
||||
WT_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD;
|
||||
|
@ -20,12 +20,12 @@
|
||||
|
||||
#include "include/test/cef_translator_test.h"
|
||||
#include "include/capi/test/cef_translator_test_capi.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
|
||||
|
||||
// Wrap a C++ class with a C structure.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
class CefTranslatorTestRefPtrLibraryChildChildCppToC
|
||||
: public CefCppToC<CefTranslatorTestRefPtrLibraryChildChildCppToC,
|
||||
: public CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryChildChildCppToC,
|
||||
CefTranslatorTestRefPtrLibraryChildChild,
|
||||
cef_translator_test_ref_ptr_library_child_child_t> {
|
||||
public:
|
||||
|
@ -111,7 +111,7 @@ CefTranslatorTestRefPtrLibraryChildCppToC::CefTranslatorTestRefPtrLibraryChildCp
|
||||
GetStruct()->base.set_value = translator_test_ref_ptr_library_child_set_value;
|
||||
}
|
||||
|
||||
template<> CefRefPtr<CefTranslatorTestRefPtrLibraryChild> CefCppToC<CefTranslatorTestRefPtrLibraryChildCppToC,
|
||||
template<> CefRefPtr<CefTranslatorTestRefPtrLibraryChild> CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryChildCppToC,
|
||||
CefTranslatorTestRefPtrLibraryChild,
|
||||
cef_translator_test_ref_ptr_library_child_t>::UnwrapDerived(
|
||||
CefWrapperType type, cef_translator_test_ref_ptr_library_child_t* s) {
|
||||
@ -125,12 +125,12 @@ template<> CefRefPtr<CefTranslatorTestRefPtrLibraryChild> CefCppToC<CefTranslato
|
||||
}
|
||||
|
||||
#if DCHECK_IS_ON()
|
||||
template<> base::AtomicRefCount CefCppToC<CefTranslatorTestRefPtrLibraryChildCppToC,
|
||||
template<> base::AtomicRefCount CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryChildCppToC,
|
||||
CefTranslatorTestRefPtrLibraryChild,
|
||||
cef_translator_test_ref_ptr_library_child_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
||||
template<> CefWrapperType CefCppToC<CefTranslatorTestRefPtrLibraryChildCppToC,
|
||||
template<> CefWrapperType CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryChildCppToC,
|
||||
CefTranslatorTestRefPtrLibraryChild,
|
||||
cef_translator_test_ref_ptr_library_child_t>::kWrapperType =
|
||||
WT_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD;
|
||||
|
@ -20,12 +20,12 @@
|
||||
|
||||
#include "include/test/cef_translator_test.h"
|
||||
#include "include/capi/test/cef_translator_test_capi.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
|
||||
|
||||
// Wrap a C++ class with a C structure.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
class CefTranslatorTestRefPtrLibraryChildCppToC
|
||||
: public CefCppToC<CefTranslatorTestRefPtrLibraryChildCppToC,
|
||||
: public CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryChildCppToC,
|
||||
CefTranslatorTestRefPtrLibraryChild,
|
||||
cef_translator_test_ref_ptr_library_child_t> {
|
||||
public:
|
||||
|
@ -73,7 +73,7 @@ CefTranslatorTestRefPtrLibraryCppToC::CefTranslatorTestRefPtrLibraryCppToC() {
|
||||
GetStruct()->set_value = translator_test_ref_ptr_library_set_value;
|
||||
}
|
||||
|
||||
template<> CefRefPtr<CefTranslatorTestRefPtrLibrary> CefCppToC<CefTranslatorTestRefPtrLibraryCppToC,
|
||||
template<> CefRefPtr<CefTranslatorTestRefPtrLibrary> CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryCppToC,
|
||||
CefTranslatorTestRefPtrLibrary,
|
||||
cef_translator_test_ref_ptr_library_t>::UnwrapDerived(CefWrapperType type,
|
||||
cef_translator_test_ref_ptr_library_t* s) {
|
||||
@ -91,12 +91,12 @@ template<> CefRefPtr<CefTranslatorTestRefPtrLibrary> CefCppToC<CefTranslatorTest
|
||||
}
|
||||
|
||||
#if DCHECK_IS_ON()
|
||||
template<> base::AtomicRefCount CefCppToC<CefTranslatorTestRefPtrLibraryCppToC,
|
||||
template<> base::AtomicRefCount CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryCppToC,
|
||||
CefTranslatorTestRefPtrLibrary,
|
||||
cef_translator_test_ref_ptr_library_t>::DebugObjCt = 0;
|
||||
#endif
|
||||
|
||||
template<> CefWrapperType CefCppToC<CefTranslatorTestRefPtrLibraryCppToC,
|
||||
template<> CefWrapperType CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryCppToC,
|
||||
CefTranslatorTestRefPtrLibrary,
|
||||
cef_translator_test_ref_ptr_library_t>::kWrapperType =
|
||||
WT_TRANSLATOR_TEST_REF_PTR_LIBRARY;
|
||||
|
@ -20,12 +20,12 @@
|
||||
|
||||
#include "include/test/cef_translator_test.h"
|
||||
#include "include/capi/test/cef_translator_test_capi.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
|
||||
|
||||
// Wrap a C++ class with a C structure.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
class CefTranslatorTestRefPtrLibraryCppToC
|
||||
: public CefCppToC<CefTranslatorTestRefPtrLibraryCppToC,
|
||||
: public CefCppToCRefCounted<CefTranslatorTestRefPtrLibraryCppToC,
|
||||
CefTranslatorTestRefPtrLibrary,
|
||||
cef_translator_test_ref_ptr_library_t> {
|
||||
public:
|
||||
|
Reference in New Issue
Block a user